summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-10 13:23:26 (GMT)
committerSteven Knight <knight@baldmt.com>2010-06-10 13:23:26 (GMT)
commitc34c9ced016ddefd7ab74cb4dd3e8832c45ce812 (patch)
treebb7404268dceb2a6568ab6d2d3c0e4b810af952c
parent1dc992070b764deba45742ca3325938c6162e995 (diff)
downloadSCons-c34c9ced016ddefd7ab74cb4dd3e8832c45ce812.zip
SCons-c34c9ced016ddefd7ab74cb4dd3e8832c45ce812.tar.gz
SCons-c34c9ced016ddefd7ab74cb4dd3e8832c45ce812.tar.bz2
More Solaris test fixes.
-rw-r--r--test/QT/source-from-ui.py2
-rw-r--r--test/rebuild-generated.py4
2 files changed, 2 insertions, 4 deletions
diff --git a/test/QT/source-from-ui.py b/test/QT/source-from-ui.py
index 38cc8c8..b8be72e 100644
--- a/test/QT/source-from-ui.py
+++ b/test/QT/source-from-ui.py
@@ -41,7 +41,7 @@ test.Qt_dummy_installation()
aaa_dll = TestSCons.dll_ + 'aaa' + TestSCons._dll
moc = 'moc_aaa.cc'
cpp = 'uic_aaa.cc'
-obj = os.path.splitext(cpp)[0] + TestSCons._shobj
+obj = TestSCons.shobj_ + os.path.splitext(cpp)[0] + TestSCons._shobj
h = 'aaa.h'
test.Qt_create_SConstruct('SConstruct')
diff --git a/test/rebuild-generated.py b/test/rebuild-generated.py
index 3808845..e50992d 100644
--- a/test/rebuild-generated.py
+++ b/test/rebuild-generated.py
@@ -71,9 +71,7 @@ test.write('SConstruct', """\
env = Environment()
-kernelDefines = env.Command("header.hh",
- [],
- Touch("$TARGET"))
+kernelDefines = env.Command("header.hh", [], "echo > $TARGET")
kernelImporterSource = env.Command(
"generated.cc", ["%s"],