diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-24 10:52:48 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-24 10:52:48 (GMT) |
| commit | 6d09bfffce34efdbb93eb4e7ccd2cbf811156608 (patch) | |
| tree | a72de11496e18b90becaedae5334a2f9dd31fb92 /test/BuildDir.py | |
| parent | ac6bb67fcd7462ba39dc5b7be07cef6f3424933c (diff) | |
| download | SCons-6d09bfffce34efdbb93eb4e7ccd2cbf811156608.zip SCons-6d09bfffce34efdbb93eb4e7ccd2cbf811156608.tar.gz SCons-6d09bfffce34efdbb93eb4e7ccd2cbf811156608.tar.bz2 | |
Better failure detection in test/BuildDir.py. (Kevin Quick)
Diffstat (limited to 'test/BuildDir.py')
| -rw-r--r-- | test/BuildDir.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/test/BuildDir.py b/test/BuildDir.py index 0877995..181d8aa 100644 --- a/test/BuildDir.py +++ b/test/BuildDir.py @@ -268,28 +268,28 @@ def equal_stats(x,y): # Make sure we did duplicate the source files in build/var2, # and that their stats are the same: -test.fail_test(not os.path.exists(test.workpath('work1', 'build', 'var2', 'f1.c'))) -test.fail_test(not os.path.exists(test.workpath('work1', 'build', 'var2', 'f2.in'))) +test.must_exist(['work1', 'build', 'var2', 'f1.c']) +test.must_exist(['work1', 'build', 'var2', 'f2.in']) test.fail_test(not equal_stats(test.workpath('work1', 'build', 'var2', 'f1.c'), test.workpath('work1', 'src', 'f1.c'))) test.fail_test(not equal_stats(test.workpath('work1', 'build', 'var2', 'f2.in'), test.workpath('work1', 'src', 'f2.in'))) # Make sure we didn't duplicate the source files in build/var3. -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var3', 'f1.c'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var3', 'f2.in'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var3', 'b1.f'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var3', 'b2.in'))) +test.must_not_exist(['work1', 'build', 'var3', 'f1.c']) +test.must_not_exist(['work1', 'build', 'var3', 'f2.in']) +test.must_not_exist(['work1', 'build', 'var3', 'b1.f']) +test.must_not_exist(['work1', 'build', 'var3', 'b2.in']) # Make sure we didn't duplicate the source files in build/var4. -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var4', 'f1.c'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var4', 'f2.in'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var4', 'b1.f'))) -test.fail_test(os.path.exists(test.workpath('work1', 'build', 'var4', 'b2.in'))) +test.must_not_exist(['work1', 'build', 'var4', 'f1.c']) +test.must_not_exist(['work1', 'build', 'var4', 'f2.in']) +test.must_not_exist(['work1', 'build', 'var4', 'b1.f']) +test.must_not_exist(['work1', 'build', 'var4', 'b2.in']) # Make sure we didn't duplicate the source files in build/var5. -test.fail_test(os.path.exists(test.workpath('build', 'var5', 'f1.c'))) -test.fail_test(os.path.exists(test.workpath('build', 'var5', 'f2.in'))) -test.fail_test(os.path.exists(test.workpath('build', 'var5', 'b1.f'))) -test.fail_test(os.path.exists(test.workpath('build', 'var5', 'b2.in'))) +test.must_not_exist(['build', 'var5', 'f1.c']) +test.must_not_exist(['build', 'var5', 'f2.in']) +test.must_not_exist(['build', 'var5', 'b1.f']) +test.must_not_exist(['build', 'var5', 'b2.in']) # verify that header files in the source directory are scanned properly: test.write(['work1', 'src', 'f1.h'], r""" |