summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2018-09-27 15:44:22 (GMT)
committerMats Wichmann <mats@linux.com>2018-09-27 15:44:22 (GMT)
commit0e8af5bca4f4eb579021b5cca705e16caa8b0fc9 (patch)
tree4dd6b203ef2047355ebd084949670d30c4a4a618
parenta7db6eb20c568892efc75fb0613aa0e0f3828624 (diff)
downloadSCons-0e8af5bca4f4eb579021b5cca705e16caa8b0fc9.zip
SCons-0e8af5bca4f4eb579021b5cca705e16caa8b0fc9.tar.gz
SCons-0e8af5bca4f4eb579021b5cca705e16caa8b0fc9.tar.bz2
Fix packaging strip-install-dir test
The expected message was not OS-neutral, failing on Windows due to backslashes. Now that Windows has tar this turned up. Interpolate os.sep to fix. Signed-off-by: Mats Wichmann <mats@linux.com>
-rw-r--r--src/CHANGES.txt1
-rw-r--r--test/packaging/strip-install-dir.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8a65750..52ab116 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -150,6 +150,7 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
- Remove obsoleted internal implementaiton of OrderedDict.
- Test for tar packaging fixups
- Stop using deprecated unittest asserts
+ - messages in strip-install-dir test now os-neutral
From Hao Wu
- typo in customized decider example in user guide
diff --git a/test/packaging/strip-install-dir.py b/test/packaging/strip-install-dir.py
index 92f0361..b81a6b4 100644
--- a/test/packaging/strip-install-dir.py
+++ b/test/packaging/strip-install-dir.py
@@ -27,6 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
"""
Test stripping the InstallBuilder of the Package source file.
"""
+import os
import TestSCons
@@ -52,10 +53,10 @@ env.Package( NAME = 'foo',
expected = """scons: Reading SConscript files ...
scons: done reading SConscript files.
scons: Building targets ...
-Copy file(s): "main.c" to "foo-1.2.3/bin/main.c"
-tar -zc -f foo-1.2.3.tar.gz foo-1.2.3/bin/main.c
+Copy file(s): "main.c" to "foo-1.2.3{os_sep}bin{os_sep}main.c"
+tar -zc -f foo-1.2.3.tar.gz foo-1.2.3{os_sep}bin{os_sep}main.c
scons: done building targets.
-"""
+""".format(os_sep=os.sep)
test.run(arguments='', stderr = None, stdout=expected)