summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2020-04-11 03:36:24 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2020-04-11 03:36:24 (GMT)
commit067ac2b4b793bd45cb3595ef311553ede59aa236 (patch)
tree292d6e40dc994fe821a49c542cb16fb525ef5673
parent4d582eed59c08a9cb42dbcebf4bb89261cc01b48 (diff)
downloadSCons-067ac2b4b793bd45cb3595ef311553ede59aa236.zip
SCons-067ac2b4b793bd45cb3595ef311553ede59aa236.tar.gz
SCons-067ac2b4b793bd45cb3595ef311553ede59aa236.tar.bz2
Fix tar bz2 test so it won't crash when no bzip2 is present
-rw-r--r--test/packaging/tar/bz2_packaging.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/packaging/tar/bz2_packaging.py b/test/packaging/tar/bz2_packaging.py
index 3c1afe3..0c8dcea 100644
--- a/test/packaging/tar/bz2_packaging.py
+++ b/test/packaging/tar/bz2_packaging.py
@@ -44,7 +44,6 @@ if not tar:
test.skip_test('tar not found, skipping test\n')
bz2 = test.where_is('bzip2')
-bz2_path = os.path.dirname(bz2)
if sys.platform == 'win32':
# windows 10 causes fresh problems by supplying a tar, not bzip2
@@ -56,6 +55,9 @@ if sys.platform == 'win32':
if tar[:8] != bz2[:8]: # catch one in \WINDOWS, one not
test.skip_test('tar found, but usable bzip2 not, skipping test\n')
+bz2_path = os.path.dirname(bz2)
+
+
test.subdir('src')
test.write([ 'src', 'main.c'], r"""