diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-04-10 09:41:00 (GMT) |
| commit | 6a37189174372c9c98c63ada58ab4352adf650e8 (patch) | |
| tree | 521ddb1071569fa90100e11d7f03af13d5689aaf /test/SConsignFile | |
| parent | 14924bcc1713c5bd7dcf4db5b420204407048889 (diff) | |
| parent | 3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff) | |
| download | SCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2 | |
Commit resolved conflicted merge.
Diffstat (limited to 'test/SConsignFile')
| -rw-r--r-- | test/SConsignFile/default.py | 2 | ||||
| -rw-r--r-- | test/SConsignFile/explicit-file.py | 2 | ||||
| -rw-r--r-- | test/SConsignFile/use-dbhash.py | 2 | ||||
| -rw-r--r-- | test/SConsignFile/use-dumbdbm.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/SConsignFile/default.py b/test/SConsignFile/default.py index f38aec8..4d56a5e 100644 --- a/test/SConsignFile/default.py +++ b/test/SConsignFile/default.py @@ -49,7 +49,7 @@ sys.exit(0) # test.write('SConstruct', """ SConsignFile() -B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES') env = Environment(BUILDERS = { 'B' : B }) env.B(target = 'f1.out', source = 'f1.in') env.B(target = 'f2.out', source = 'f2.in') diff --git a/test/SConsignFile/explicit-file.py b/test/SConsignFile/explicit-file.py index 33963c2..90c2241 100644 --- a/test/SConsignFile/explicit-file.py +++ b/test/SConsignFile/explicit-file.py @@ -49,7 +49,7 @@ file.close() test.write('SConstruct', """ e = Environment(XXX = 'scons') e.SConsignFile('my_${XXX}ign') -B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES') env = Environment(BUILDERS = { 'B' : B }) env.B(target = 'f5.out', source = 'f5.in') env.B(target = 'f6.out', source = 'f6.in') diff --git a/test/SConsignFile/use-dbhash.py b/test/SConsignFile/use-dbhash.py index bd9b799..f70c8b0 100644 --- a/test/SConsignFile/use-dbhash.py +++ b/test/SConsignFile/use-dbhash.py @@ -55,7 +55,7 @@ test.write('SConstruct', """ import sys import dbhash SConsignFile('.sconsign', dbhash) -B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES') env = Environment(BUILDERS = { 'B' : B }) env.B(target = 'f1.out', source = 'f1.in') env.B(target = 'f2.out', source = 'f2.in') diff --git a/test/SConsignFile/use-dumbdbm.py b/test/SConsignFile/use-dumbdbm.py index 84f1dd4..02a52da 100644 --- a/test/SConsignFile/use-dumbdbm.py +++ b/test/SConsignFile/use-dumbdbm.py @@ -55,7 +55,7 @@ test.write('SConstruct', """ import sys import dumbdbm SConsignFile('.sconsign', dumbdbm) -B = Builder(action = '%(_python_)s build.py $TARGETS $SOURCES') +B = Builder(action = r'%(_python_)s build.py $TARGETS $SOURCES') env = Environment(BUILDERS = { 'B' : B }) env.B(target = 'f1.out', source = 'f1.in') env.B(target = 'f2.out', source = 'f2.in') |