diff options
| author | Steven Knight <knight@baldmt.com> | 2010-08-27 22:05:11 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-08-27 22:05:11 (GMT) |
| commit | 98240830ca84be4e8b07a499753a73feaf6ac3ae (patch) | |
| tree | 8d81219bbc1e0b543ee7503b4bc3bf2429bb9857 /test/sconsign/script/no-SConsignFile.py | |
| parent | 017f807a0745357b4b9b16c52738ef5949f84b90 (diff) | |
| download | SCons-98240830ca84be4e8b07a499753a73feaf6ac3ae.zip SCons-98240830ca84be4e8b07a499753a73feaf6ac3ae.tar.gz SCons-98240830ca84be4e8b07a499753a73feaf6ac3ae.tar.bz2 | |
Python2.7 fix: the timestamp in the sconsign --raw output may have an
'L' appended (at least on Windows).
Diffstat (limited to 'test/sconsign/script/no-SConsignFile.py')
| -rw-r--r-- | test/sconsign/script/no-SConsignFile.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py index fe68f91..829d650 100644 --- a/test/sconsign/script/no-SConsignFile.py +++ b/test/sconsign/script/no-SConsignFile.py @@ -159,14 +159,14 @@ hello.obj: %(sig_re)s \d+ \d+ test.run_sconsign(arguments = "sub1/.sconsign", stdout=expect) test.run_sconsign(arguments = "--raw sub1/.sconsign", - stdout = r"""hello.c: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} -hello.exe: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} - %(sub1_hello_obj)s: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} - fake_link\.py: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} + stdout = r"""hello.c: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} +hello.exe: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} + %(sub1_hello_obj)s: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} + fake_link\.py: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} %(sig_re)s \[.*\] -hello.obj: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} - %(sub1_hello_c)s: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} - fake_cc\.py: {'csig': '%(sig_re)s', 'timestamp': \d+, 'size': \d+L?, '_version_id': 1} +hello.obj: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} + %(sub1_hello_c)s: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} + fake_cc\.py: {'csig': '%(sig_re)s', 'timestamp': \d+L?, 'size': \d+L?, '_version_id': 1} %(sig_re)s \[.*\] """ % locals()) |