SConscript (12363:8ca0fee7f9b3) SConscript (12370:945fbd508c87)
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2005 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 1035 unchanged lines hidden (view full) ---

1044 if test.main:
1045 test_objs += main_objs
1046 path = 'unittest/%s.%s' % (test.target, label)
1047 new_env.Program(path, test_objs + static_objs)
1048
1049 gtest_env = new_env.Clone()
1050 gtest_env.Append(LIBS=gtest_env['GTEST_LIBS'])
1051 gtest_env.Append(CPPFLAGS=gtest_env['GTEST_CPPFLAGS'])
1# -*- mode:python -*-
2
3# Copyright (c) 2004-2005 The Regents of The University of Michigan
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions are
8# met: redistributions of source code must retain the above copyright

--- 1035 unchanged lines hidden (view full) ---

1044 if test.main:
1045 test_objs += main_objs
1046 path = 'unittest/%s.%s' % (test.target, label)
1047 new_env.Program(path, test_objs + static_objs)
1048
1049 gtest_env = new_env.Clone()
1050 gtest_env.Append(LIBS=gtest_env['GTEST_LIBS'])
1051 gtest_env.Append(CPPFLAGS=gtest_env['GTEST_CPPFLAGS'])
1052 gtests = []
1052 for test in GTest.all:
1053 test_sources = Source.all.with_tag(str(test.target))
1054 test_objs = [ s.static(gtest_env) for s in test_sources ]
1053 for test in GTest.all:
1054 test_sources = Source.all.with_tag(str(test.target))
1055 test_objs = [ s.static(gtest_env) for s in test_sources ]
1055 gtest_env.Program(test.dir.File('%s.%s' % (test.target, label)),
1056 test_objs)
1056 gtests.append(gtest_env.Program(
1057 test.dir.File('%s.%s' % (test.target, label)), test_objs))
1057
1058
1059 gtest_target = Dir(new_env['BUILDDIR']).File('unittests.%s' % label)
1060 AlwaysBuild(Command(gtest_target, gtests, gtests))
1061
1058 progname = exename
1059 if strip:
1060 progname += '.unstripped'
1061
1062 targets = new_env.Program(progname, main_objs + static_objs)
1063
1064 if strip:
1065 if sys.platform == 'sunos5':

--- 118 unchanged lines hidden ---
1062 progname = exename
1063 if strip:
1064 progname += '.unstripped'
1065
1066 targets = new_env.Program(progname, main_objs + static_objs)
1067
1068 if strip:
1069 if sys.platform == 'sunos5':

--- 118 unchanged lines hidden ---