Change the double quotes around an up-to-date target to be like Make.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@718 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index f23c5da242f23775f96d52fd95a2da6e0312a751..786b394f1d9bad5d58ffc61893053d045dc8950c 100644 (file)
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -258,7 +258,7 @@ class TestSCons(TestCmd.TestCmd):
     def up_to_date(self, options = None, arguments = None, **kw):
         s = ""
         for arg in string.split(arguments):
-            s = s + 'scons: "%s" is up to date.\n' % arg
+            s = s + "scons: `%s' is up to date.\n" % arg
             if options:
                 arguments = options + " " + arguments
         kw['arguments'] = arguments

diff --git a/runtest.py b/runtest.py
index 049643a12522a35d8a86a46c7836113d349a5fad..aa8db9d0e7309b0366cbbed8793eb566be2590a0 100644 (file)
--- a/runtest.py
+++ b/runtest.py
@@ -157,8 +157,11 @@ def whereis(file):
 
 aegis = whereis('aegis')
 
-spe = None
+sp = []
+spe = []
 if aegis:
+    sp = os.popen("aesub '$sp' 2>/dev/null", "r").read()[:-1]
+    sp = string.split(sp, os.pathsep)
     spe = os.popen("aesub '$spe' 2>/dev/null", "r").read()[:-1]
     spe = string.split(spe, os.pathsep)
 
@@ -315,11 +318,13 @@ os.environ['SCONS_CWD'] = cwd
 os.environ['SCONS_VERSION'] = version
 
 old_pythonpath = os.environ.get('PYTHONPATH')
-os.environ['PYTHONPATH'] = pythonpath_dir + \
-                           os.pathsep + \
-                           os.path.join(cwd, 'build', 'etc') + \
-                           os.pathsep + \
-                           os.path.join(cwd, 'etc')
+
+pythonpaths = [ pythonpath_dir ]
+for p in sp:
+    pythonpaths.append(os.path.join(p, 'build', 'etc'))
+    pythonpaths.append(os.path.join(p, 'etc'))
+os.environ['PYTHONPATH'] = string.join(pythonpaths, os.pathsep)
+
 if old_pythonpath:
     os.environ['PYTHONPATH'] = os.environ['PYTHONPATH'] + \
                                os.pathsep + \

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index c37f3ab2600ee2b00edfec9aeda9e49bc7a5ae94..aadcc93ed7b4aa52a96039d805d9ee97d06d2f9c 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -57,6 +57,9 @@ RELEASE 0.15 - XXX
   - Make the Script.Options() subclass match the underlying base class
     implementation.
 
+  - When reporting a target is up to date, quote the target like make
+    (backquote-quote) instead of with double quotes.
+
   From Steve Leblanc:
 
   - Don't update the .sconsign files when run with -n.

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 139d2964aaa653d43b57d670d7b32ad8c3bdc964..9ae5229d2b0335d985be723356de28d8fa32a618 100644 (file)
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -80,7 +80,7 @@ class BuildTask(SCons.Taskmaster.Task):
         target = self.targets[0]
         if target.get_state() == SCons.Node.up_to_date:
             if self.top and target.has_builder():
-                display('scons: "%s" is up to date.' % str(target))
+                display("scons: `%s' is up to date." % str(target))
         elif target.has_builder() and not hasattr(target.builder, 'status'):
             if print_time:
                 start_time = time.time()

diff --git a/test/BuildDir.py b/test/BuildDir.py
index f38505e53905960391481d128f518127082a2b9e..63ecf6eeaa647247e0c8027e629f86cdf8e3a0cb 100644 (file)
--- a/test/BuildDir.py
+++ b/test/BuildDir.py
@@ -239,8 +239,8 @@ if f77:
     test.run(program = bar52, stdout = " b2.for\n")
 
 test.run(chdir='work1', arguments='. ../build', stdout=test.wrap_stdout("""\
-scons: "." is up to date.
-scons: "%s" is up to date.
+scons: `.' is up to date.
+scons: `%s' is up to date.
 """ % test.workpath('build')))
 
 import os
@@ -298,7 +298,7 @@ test.run(program = test.workpath('build', 'var5', 'foo4' + _exe),
                                  stdout = "f4.c 2\n")
 
 test.run(chdir='work1', arguments='../build/var5', stdout=test.wrap_stdout("""\
-scons: "%s" is up to date.
+scons: `%s' is up to date.
 """ % test.workpath('build', 'var5')))
 
 #
@@ -358,7 +358,7 @@ test.write( ['work3', 'existing.h'], """\
 """)
 
 test.run(chdir='work3',
-         stdout=test.wrap_stdout('scons: "." is up to date.\n'),
+         stdout=test.wrap_stdout("scons: `.' is up to date.\n"),
          stderr="""\
 existing.h:/* a header file */
 non_existing.h:

diff --git a/test/Configure.py b/test/Configure.py
index eeb040d762099764351a24d3d243fc2ad82eaf1e..78558fc576d1a5074657f5a2aeb0fa444eec964a 100644 (file)
--- a/test/Configure.py
+++ b/test/Configure.py
@@ -91,7 +91,7 @@ if not (r1 and r2 and r3 and r4 and r5 and r6):
      Exit(1)
 """ % (lib,lib))
 
-    required_stdout = test.wrap_stdout(build_str='scons: "." is up to date.\n',
+    required_stdout = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
                                        read_str=
     """Checking for main(); in library %s (header math.h) ... ok
 Checking for main(); in library None (header math.h) ... ok
@@ -125,7 +125,7 @@ if not (not r1 and not r2):
      Exit(1)
 """)
 
-    required_stdout = test.wrap_stdout(build_str='scons: "." is up to date.\n',
+    required_stdout = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
                                        read_str=
     """Checking for C header no_std_c_header.h ... failed
 Checking for main in library no_c_library_SAFFDG ... failed

diff --git a/test/FindFile.py b/test/FindFile.py
index 1c1a4fe7435b974dd6b228e4d5dd8e2b80df5766..9c837b5fee90dd3bf4e4782fe5d8b6b09ea7685e 100644 (file)
--- a/test/FindFile.py
+++ b/test/FindFile.py
@@ -56,7 +56,7 @@ test 2
 
 test 4
 
-""", build_str = 'scons: "." is up to date.\n')
+""", build_str = "scons: `.' is up to date.\n")
 
 test.run(arguments = ".", stdout = expect)
 

diff --git a/test/ParseConfig.py b/test/ParseConfig.py
index b045baa65a95ad4b7e55a32064fbea03d38bd5dc..da9bad10de9ef398a6b348e2980fff7bb72b195e 100644 (file)
--- a/test/ParseConfig.py
+++ b/test/ParseConfig.py
@@ -64,7 +64,7 @@ good_stdout = test.wrap_stdout(read_str = """\
 ['xxx']
 ['-X']
 ['abc']
-""", build_str = 'scons: "." is up to date.\n')
+""", build_str = "scons: `.' is up to date.\n")
 
 test.run(arguments = ".", stdout = good_stdout)
 

diff --git a/test/Platform.py b/test/Platform.py
index b89ed2f1ded1f995a49dc95bf41b37b813deecf3..94961fba01e0d5c7795e190e664f48304f325f01 100644 (file)
--- a/test/Platform.py
+++ b/test/Platform.py
@@ -62,7 +62,7 @@ expect = test.wrap_stdout(read_str = """'.exe'
 '.lib'
 '.a'
 '.lib'
-""", build_str = 'scons: "." is up to date.\n')
+""", build_str = "scons: `.' is up to date.\n")
 
 test.run(arguments = ".", stdout = expect)
 

diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py
index b55a1da4034e5ec57e5e42395ac6f3fd05b1f48e..10016a01b1eafe5a5b721d5ac298e21474a49fe8 100644 (file)
--- a/test/Repository/option-n.py
+++ b/test/Repository/option-n.py
@@ -73,7 +73,7 @@ test.writable('repository', 0)
 #
 expect = test.wrap_stdout("""\
 Local copy of aaa.out from %s
-scons: "aaa.out" is up to date.
+scons: `aaa.out' is up to date.
 """ % repository_aaa_out)
 
 test.run(chdir = 'work',

diff --git a/test/SConscript.py b/test/SConscript.py
index 34aaa052a0dce56cfd1251e5176a76b45d2e3c68..810017da6f0d1585f0edba46b4d5517d0cfc2662 100644 (file)
--- a/test/SConscript.py
+++ b/test/SConscript.py
@@ -210,7 +210,7 @@ wpath = test.workpath()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'SConstruct %s\nSConscript %s\n' % (wpath, wpath),
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 # Test exporting all global variables as a list of keys:
 test.write("SConstruct", """

diff --git a/test/SConstruct.py b/test/SConstruct.py
index 091984d3655b082f5d76fe2c1976ea4f41ebbe6d..cd201d269f888b674f35db5d82d9bad98abe3f6f 100644 (file)
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -48,7 +48,7 @@ print "sconstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'sconstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 
 test.write('Sconstruct', """
@@ -58,7 +58,7 @@ print "Sconstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'Sconstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.write('SConstruct', """
 import os
@@ -67,6 +67,6 @@ print "SConstruct", os.getcwd()
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = 'SConstruct %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()

diff --git a/test/Scanner.py b/test/Scanner.py
index 6016795763ba29148f5dc975e63d14c77c0f8e1d..42ef18dc534ef8edc00e34816e3fb59f6bc4476a 100644 (file)
--- a/test/Scanner.py
+++ b/test/Scanner.py
@@ -50,7 +50,7 @@ sys.exit(0)
 """)
 
 # Execute a subsidiary SConscript just to make sure we can
-# get at the SCanners keyword from there.
+# get at the Scanner keyword from there.
 
 test.write('SConstruct', """
 SConscript('SConscript')
@@ -132,7 +132,6 @@ test.fail_test(test.read('foo') != "foo.k 1 line 1\nxxx 2\nyyy 2\nfoo.k 1 line 4
 
 test.fail_test(test.read('bar') != "yyy 2\nbar.in 1 line 2\nbar.in 1 line 3\nzzz 2\n")
 
-test.run(arguments = 'foo',
-         stdout=test.wrap_stdout('scons: "foo" is up to date.\n'))
+test.up_to_date(arguments = 'foo')
 
 test.pass_test()

diff --git a/test/SetBuildSignatureType.py b/test/SetBuildSignatureType.py
index 0d625a82878bd2b65a050d4e424bca3004899514..54f967f932ef6cf0901e9023f9fb878fb8273fa2 100644 (file)
--- a/test/SetBuildSignatureType.py
+++ b/test/SetBuildSignatureType.py
@@ -63,7 +63,7 @@ copy1("foo.out.out", "foo.out")
          stderr=warning%16)
 
 test.run(arguments='foo.out.out',
-         stdout=test.wrap_stdout('scons: "foo.out.out" is up to date.\n'),
+         stdout=test.wrap_stdout("scons: `foo.out.out' is up to date.\n"),
          stderr=warning%16)
 
 test.write('SConstruct', """
@@ -88,7 +88,7 @@ SetBuildSignatureType('content')
 test.run(arguments='foo.out.out',
          stdout=test.wrap_stdout("""\
 copy2("foo.out", "foo.in")
-scons: "foo.out.out" is up to date.
+scons: `foo.out.out' is up to date.
 """),
          stderr=warning%17)
 

diff --git a/test/SetContentSignatureType.py b/test/SetContentSignatureType.py
index 7f161fe22efa36981b9240164b2bc5c39a2842be..586d55b97ac4d8ac5410f052c4d814b91b964b34 100644 (file)
--- a/test/SetContentSignatureType.py
+++ b/test/SetContentSignatureType.py
@@ -62,9 +62,9 @@ test.run(arguments = 'f1.out f3.out',
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
+scons: `f1.out' is up to date.
 build("f2.out", "f2.in")
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 build("f4.out", "f4.in")
 """),
          stderr = warning%11)
@@ -79,9 +79,9 @@ os.utime(test.workpath('f3.in'),
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
 build("f1.out", "f1.in")
-scons: "f2.out" is up to date.
+scons: `f2.out' is up to date.
 build("f3.out", "f3.in")
-scons: "f4.out" is up to date.
+scons: `f4.out' is up to date.
 """),
          stderr = warning%11)
 
@@ -108,9 +108,9 @@ test.run(arguments = 'f1.out f3.out',
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
+scons: `f1.out' is up to date.
 build("f2.out", "f2.in")
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 build("f4.out", "f4.in")
 """),
          stderr = warning%11)
@@ -123,7 +123,12 @@ os.utime(test.workpath('f3.in'),
           os.path.getmtime(test.workpath('f3.in'))+10))
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
-         stdout = test.wrap_stdout('scons: "f1.out" is up to date.\nscons: "f2.out" is up to date.\nscons: "f3.out" is up to date.\nscons: "f4.out" is up to date.\n'),
+         stdout = test.wrap_stdout("""\
+scons: `f1.out' is up to date.
+scons: `f2.out' is up to date.
+scons: `f3.out' is up to date.
+scons: `f4.out' is up to date.
+"""),
          stderr = warning%11)
 
 test.write('SConstruct', """
@@ -137,13 +142,7 @@ env.B(target = 'f3.out', source = 'f3.in')
 env.B(target = 'f4.out', source = 'f4.in')
 """)
 
-test.run(arguments = 'f1.out f2.out f3.out f4.out',
-         stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
-scons: "f2.out" is up to date.
-scons: "f3.out" is up to date.
-scons: "f4.out" is up to date.
-"""))
+test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out')
 
 test.pass_test()
 

diff --git a/test/SourceSignatures.py b/test/SourceSignatures.py
index 979003a61e887df8c039df44b24c35c161530e39..26a389e2eafbe2b378de604cecb219b5f7b4a464 100644 (file)
--- a/test/SourceSignatures.py
+++ b/test/SourceSignatures.py
@@ -54,9 +54,9 @@ test.run(arguments = 'f1.out f3.out')
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
+scons: `f1.out' is up to date.
 build("f2.out", "f2.in")
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 build("f4.out", "f4.in")
 """))
 
@@ -70,9 +70,9 @@ os.utime(test.workpath('f3.in'),
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
 build("f1.out", "f1.in")
-scons: "f2.out" is up to date.
+scons: `f2.out' is up to date.
 build("f3.out", "f3.in")
-scons: "f4.out" is up to date.
+scons: `f4.out' is up to date.
 """))
 
 test.write('SConstruct', """
@@ -97,9 +97,9 @@ test.run(arguments = 'f1.out f3.out')
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
+scons: `f1.out' is up to date.
 build("f2.out", "f2.in")
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 build("f4.out", "f4.in")
 """))
 
@@ -110,8 +110,7 @@ os.utime(test.workpath('f3.in'),
          (os.path.getatime(test.workpath('f3.in')),
           os.path.getmtime(test.workpath('f3.in'))+10))
 
-test.run(arguments = 'f1.out f2.out f3.out f4.out',
-         stdout = test.wrap_stdout('scons: "f1.out" is up to date.\nscons: "f2.out" is up to date.\nscons: "f3.out" is up to date.\nscons: "f4.out" is up to date.\n'))
+test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out')
 
 test.write('SConstruct', """
 def build(env, target, source):
@@ -124,13 +123,7 @@ env.B(target = 'f3.out', source = 'f3.in')
 env.B(target = 'f4.out', source = 'f4.in')
 """)
 
-test.run(arguments = 'f1.out f2.out f3.out f4.out',
-         stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
-scons: "f2.out" is up to date.
-scons: "f3.out" is up to date.
-scons: "f4.out" is up to date.
-"""))
+test.up_to_date(arguments = 'f1.out f2.out f3.out f4.out')
 
 test.pass_test()
 

diff --git a/test/Split.py b/test/Split.py
index 5b698bce7b8bbd7bcb29be7422d56d325dbfadda..46a19e578fa6a71604fbd2876ad31c7973a2e259 100644 (file)
--- a/test/Split.py
+++ b/test/Split.py
@@ -51,6 +51,6 @@ expect = """['aaa']
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = expect,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()

diff --git a/test/TargetSignatures.py b/test/TargetSignatures.py
index 036427ebbb90e53de32ac7fad83023274b1eae11..3c7ed0f2cdf365de3b0bbca2045eb514e15475a5 100644 (file)
--- a/test/TargetSignatures.py
+++ b/test/TargetSignatures.py
@@ -54,8 +54,7 @@ copy2("foo.out", "foo.in")
 copy1("foo.out.out", "foo.out")
 """))
 
-test.run(arguments='foo.out.out',
-         stdout=test.wrap_stdout('scons: "foo.out.out" is up to date.\n'))
+test.up_to_date(arguments='foo.out.out')
 
 test.write('SConstruct', """
 env = Environment()
@@ -79,7 +78,7 @@ TargetSignatures('content')
 test.run(arguments='foo.out.out',
          stdout=test.wrap_stdout("""\
 copy2("foo.out", "foo.in")
-scons: "foo.out.out" is up to date.
+scons: `foo.out.out' is up to date.
 """))
 
 test.write('SConstruct', """

diff --git a/test/WhereIs.py b/test/WhereIs.py
index 07d3b088d9bc03d32402410e35799b0f314f85ac..9da3739cfc5db2f27087524e9b9f7aa1465e596a 100644 (file)
--- a/test/WhereIs.py
+++ b/test/WhereIs.py
@@ -107,7 +107,7 @@ expect = [ test.workpath(sub3_xxx_exe),
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = string.join(expect, "\n") + "\n",
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 os.environ['PATH'] = string.join(pathdirs_1243, os.pathsep)
 
@@ -125,6 +125,6 @@ expect = [ test.workpath(sub4_xxx_exe),
 
 test.run(arguments = ".",
          stdout = test.wrap_stdout(read_str = string.join(expect, "\n") + "\n",
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()

diff --git a/test/chained-build.py b/test/chained-build.py
index a2443c87b9a285c9cc58d789f5c54c6fdb033f7c..e4463e5af09964e2f476c75677d2f028464c04e7 100644 (file)
--- a/test/chained-build.py
+++ b/test/chained-build.py
@@ -51,10 +51,8 @@ test.run(arguments="--max-drift=0 -f SConstruct1 foo.mid",
 test.run(arguments="--max-drift=0 -f SConstruct2 foo.out",
          stdout = test.wrap_stdout('build("foo.out", "foo.mid")\n'))
 
-test.run(arguments="--max-drift=0 -f SConstruct1 foo.mid",
-         stdout = test.wrap_stdout('scons: "foo.mid" is up to date.\n'))
-test.run(arguments="--max-drift=0 -f SConstruct2 foo.out",
-         stdout = test.wrap_stdout('scons: "foo.out" is up to date.\n'))
+test.up_to_date(options="--max-drift=0 -f SConstruct1", arguments="foo.mid")
+test.up_to_date(options="--max-drift=0 -f SConstruct2", arguments="foo.out")
 
 test.write('foo.in', "foo.in 2")
 
@@ -63,9 +61,7 @@ test.run(arguments="--max-drift=0 -f SConstruct1 foo.mid",
 test.run(arguments="--max-drift=0 -f SConstruct2 foo.out",
          stdout = test.wrap_stdout('build("foo.out", "foo.mid")\n'))
 
-test.run(arguments="--max-drift=0 -f SConstruct1 foo.mid",
-         stdout = test.wrap_stdout('scons: "foo.mid" is up to date.\n'))
-test.run(arguments="--max-drift=0 -f SConstruct2 foo.out",
-         stdout = test.wrap_stdout('scons: "foo.out" is up to date.\n'))
+test.up_to_date(options="--max-drift=0 -f SConstruct1", arguments="foo.mid")
+test.up_to_date(options="--max-drift=0 -f SConstruct2", arguments="foo.out")
 
 test.pass_test()

diff --git a/test/errors.py b/test/errors.py
index 72e34d3ea3567d77dff3f680285f4daddf587a34..46a80ed6e0cbfc3f45c6dc6000aff2fc2bb60004 100644 (file)
--- a/test/errors.py
+++ b/test/errors.py
@@ -66,7 +66,7 @@ Traceback \((most recent call|innermost) last\):
 test.run(arguments='foo.out exit.out', stderr=stderr, status=2)
 
 test.run(arguments='foo.out exit.out', stderr=stderr, status=2)
-assert string.find(test.stdout(), 'scons: "foo.out" is up to date.') != -1, test.stdout()
+assert string.find(test.stdout(), "scons: `foo.out' is up to date.") != -1, test.stdout()
 
 
 

diff --git a/test/exitfns.py b/test/exitfns.py
index a0ac6e2dfd2cac6cffa636f19d0ce781b1171b89..742ac9f20dd86abf916ee4e785b8ccdb15769601 100644 (file)
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -46,7 +46,7 @@ register(x3, "no kwd args")
 
 """
 
-expected_output = test.wrap_stdout('scons: "." is up to date.\n') + \
+expected_output = test.wrap_stdout("scons: `.' is up to date.\n") + \
 """running x3('no kwd args', kwd=None)
 running x3(5, kwd='bar')
 running x2(12)

diff --git a/test/option--C.py b/test/option--C.py
index 8c9a07bfa93efa92ce49447fdc0d0f0c8f1b155e..c889602d9e4587b09b68936ed1aa7fa49224cb20 100644 (file)
--- a/test/option--C.py
+++ b/test/option--C.py
@@ -67,23 +67,23 @@ print GetBuildPath('..')
 
 test.run(arguments = '-C sub .',
         stdout = test.wrap_stdout(read_str = '%s\n' % wpath,
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '-C sub -C dir .',
         stdout = test.wrap_stdout(read_str = '%s\n' % wpath_sub,
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = ".",
         stdout = test.wrap_stdout(read_str = 'SConstruct %s\n' % wpath,
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--directory=sub/dir .',
         stdout = test.wrap_stdout(read_str = '%s\n' % wpath_sub,
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '-C %s -C %s .' % (wpath_sub_dir, wpath_sub),
         stdout = test.wrap_stdout(read_str = '%s\n' % wpath,
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
  

diff --git a/test/option--I.py b/test/option--I.py
index b0e92544596c8249af8ab246c88418435905dc50..05da4c0d76ccc2b0474cf384dbb177f826f4a207 100644 (file)
--- a/test/option--I.py
+++ b/test/option--I.py
@@ -53,11 +53,11 @@ print bar.variable
 
 test.run(arguments = '-I sub1 -I sub2 .',
          stdout = test.wrap_stdout(read_str = 'sub1/foo\nsub2/bar\n',
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--include-dir=sub2 --include-dir=sub1 .',
         stdout = test.wrap_stdout(read_str = 'sub2/foo\nsub2/bar\n',
-                                  build_str = 'scons: "." is up to date.\n'))
+                                  build_str = "scons: `.' is up to date.\n"))
 
 test.pass_test()
  

diff --git a/test/option--debug.py b/test/option--debug.py
index 489498392c37c9574ca46fc2d7dce4fc67dc69ec..05839127bbd449e245cf415398fdada572ba4e13 100644 (file)
--- a/test/option--debug.py
+++ b/test/option--debug.py
@@ -107,7 +107,7 @@ test.fail_test(string.find(test.stdout(), tree) == -1)
 test.run(arguments = "--debug=includes .")
 test.run(arguments = "--debug=includes foo.c")
 
-tree = """scons: \".\" is up to date.
+tree = """scons: `.' is up to date.
 
 +-.
   +-SConstruct

diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 3b90b681f7a10d0fb5ba64c01f3e1434ec5761a6..255b3b13f7604689f5e8dac66eb039b4ca5f6fb0 100644 (file)
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -60,32 +60,24 @@ test.run(arguments = 'f1.out')
 
 test.run(arguments = 'f1.out f2.out',
          stdout = test.wrap_stdout(
-"""scons: "f1.out" is up to date.
+"""scons: `f1.out' is up to date.
 %s build.py f2.out f2.in
 """ % python))
 
 atime = os.path.getatime(test.workpath('f1.in'))
 mtime = os.path.getmtime(test.workpath('f1.in'))
 
-test.run(arguments = '--max-drift=0 f1.out f2.out',
-         stdout = test.wrap_stdout(
-"""scons: "f1.out" is up to date.
-scons: "f2.out" is up to date.
-"""))
+test.up_to_date(options='--max-drift=0', arguments='f1.out f2.out')
 
 test.write('f1.in', "f1.in delta\n")
 os.utime(test.workpath('f1.in'), (atime,mtime))
 
-test.run(arguments = '--max-drift=0 f1.out f2.out',
-         stdout = test.wrap_stdout(
-"""scons: "f1.out" is up to date.
-scons: "f2.out" is up to date.
-"""))
+test.up_to_date(options='--max-drift=0', arguments='f1.out f2.out')
 
 test.run(arguments = '--max-drift=-1 f1.out f2.out',
          stdout = test.wrap_stdout(
 """%s build.py f1.out f1.in
-scons: "f2.out" is up to date.
+scons: `f2.out' is up to date.
 """ % python))
 
 # Test that Set/GetOption('max_drift') works:

diff --git a/test/option-f.py b/test/option-f.py
index ee1c18cdfa319f14f917801eb2d248a921226f77..2001a06bbe05f6c33d73500b3e8aef1ebba1245e 100644 (file)
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -47,45 +47,45 @@ wpath = test.workpath()
 
 test.run(arguments = '-f SConscript .',
          stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '-f %s .' % subdir_BuildThis,
          stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--file=SConscript .',
          stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--file=%s .' % subdir_BuildThis,
          stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--makefile=SConscript .',
          stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--makefile=%s .' % subdir_BuildThis,
          stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--sconstruct=SConscript .',
          stdout = test.wrap_stdout(read_str = 'SConscript %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '--sconstruct=%s .' % subdir_BuildThis,
          stdout = test.wrap_stdout(read_str = 'subdir/BuildThis %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '-f - .', stdin = """
 import os
 print "STDIN " + os.getcwd()
 """,
          stdout = test.wrap_stdout(read_str = 'STDIN %s\n' % wpath,
-                                   build_str = 'scons: "." is up to date.\n'))
+                                   build_str = "scons: `.' is up to date.\n"))
 
 test.run(arguments = '-f no_such_file .',
-         stdout = test.wrap_stdout('scons: "." is up to date.\n'),
+         stdout = test.wrap_stdout("scons: `.' is up to date.\n"),
          stderr = "Ignoring missing SConscript 'no_such_file'\n")
 
 test.pass_test()

diff --git a/test/option-n.py b/test/option-n.py
index 86f4c3ab8611f7e60fab4fe19458567d27e17995..7a324b5da776da0b642b54af481e839ea78dd020 100644 (file)
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -216,7 +216,7 @@ test.fail_test(os.path.exists(test.workpath("configure", "config.log")))
 
 # test that no error is raised, if all targets are up-to-date. In this
 # case .cache and config.log shouldn't be created
-stdout=test.wrap_stdout(build_str='scons: "." is up to date.\n',
+stdout=test.wrap_stdout(build_str="scons: `.' is up to date.\n",
                         read_str="""\
 Executing Custom Test ... ok
 """)

diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py
index 9ea515c43b42dd73f3430f87dae8478651650db6..ba70d0c23fbe10d43ba669694b8797c16f8b2748 100644 (file)
--- a/test/timestamp-fallback.py
+++ b/test/timestamp-fallback.py
@@ -68,9 +68,9 @@ test.run(arguments = 'f1.out f3.out')
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
-scons: "f1.out" is up to date.
+scons: `f1.out' is up to date.
 build("f2.out", "f2.in")
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 build("f4.out", "f4.in")
 """))
 
@@ -84,9 +84,9 @@ os.utime(test.workpath('f3.in'),
 test.run(arguments = 'f1.out f2.out f3.out f4.out',
          stdout = test.wrap_stdout("""\
 build("f1.out", "f1.in")
-scons: "f2.out" is up to date.
+scons: `f2.out' is up to date.
 build("f3.out", "f3.in")
-scons: "f4.out" is up to date.
+scons: `f4.out' is up to date.
 """))
 
 

diff --git a/test/up-to-date.py b/test/up-to-date.py
index 8311444a6162b1cc94aa8a1084845af3b65ac1bf..460401a13e64e42f722c282f23b4c68374c2140f 100644 (file)
--- a/test/up-to-date.py
+++ b/test/up-to-date.py
@@ -58,9 +58,10 @@ test.write('f4.in', "f4.in\n")
 test.run(arguments = 'f1.out f3.out')
 
 test.run(arguments = 'f1.out f2.out f3.out f4.out', stdout =
-test.wrap_stdout("""scons: "f1.out" is up to date.
+test.wrap_stdout("""\
+scons: `f1.out' is up to date.
 %s build.py f2.out f2.in
-scons: "f3.out" is up to date.
+scons: `f3.out' is up to date.
 %s build.py f4.out f4.in
 """ % (python, python)))