Fix many incorrect string escape sequences.

bfgroup · Dec 1, 2023 · 9e3cf11 · 9e3cf11
1 parent 8c329fc
commit 9e3cf11
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/test/debugger.py b/test/debugger.py
@@ -45,7 +45,7 @@ def test_run():
     run(t, """\
 (b2db) run -ftest.jam
 Starting program: {{bjam}} -ftest.jam
-Child {{\d+}} exited with status 0
+Child {{\\d+}} exited with status 0
 (b2db) quit
 """)
 
@@ -60,7 +60,7 @@ def test_exit_status():
 (b2db) run -ftest.jam
 Starting program: {{bjam}} -ftest.jam
 
-Child {{\d+}} exited with status 1
+Child {{\\d+}} exited with status 1
 (b2db) quit
 """)
     t.cleanup()
@@ -384,7 +384,7 @@ def test_breakpoints():
 Deleted breakpoint 3
 (b2db) run -ftest.jam
 Starting program: {{bjam}} -ftest.jam
-Child {{\d+}} exited with status 0
+Child {{\\d+}} exited with status 0
 (b2db) quit
 """)
     t.cleanup()
@@ -473,7 +473,7 @@ def test_breakpoints_running():
 (b2db) clear test.jam:12
 Deleted breakpoint 4
 (b2db) continue
-Child {{\d+}} exited with status 0
+Child {{\\d+}} exited with status 0
 (b2db) quit
 """)
     t.cleanup()
@@ -553,7 +553,7 @@ def test_run_running():
 Breakpoint 1, module scope at test.jam:1
 1	        UPDATE ;
 (b2db) run -ftest.jam
-Child {{\d+}} exited with status 0
+Child {{\\d+}} exited with status 0
 Starting program: {{bjam}} -ftest.jam
 Breakpoint 1, module scope at test.jam:1
 1	        UPDATE ;

diff --git a/test/feature_implicit_dependency.py b/test/feature_implicit_dependency.py
@@ -87,14 +87,14 @@ class bbb-generator : generator
 flags make-ccc AAAPATH : <aaa-path> ;
 rule make-ccc ( target : sources * : properties * )
 {
-    ECHO aaa path\: [ on $(target) return $(AAAPATH) ] ;
+    ECHO aaa path\\: [ on $(target) return $(AAAPATH) ] ;
     common.copy $(target) : $(sources) ;
 }
 
 flags make-ddd BBBPATH : <bbb-path> ;
 rule make-ddd ( target : sources * : properties * )
 {
-    ECHO bbb path\: [ on $(target) return $(BBBPATH) ] ;
+    ECHO bbb path\\: [ on $(target) return $(BBBPATH) ] ;
     common.copy $(target) : $(sources) ;
 }
 

diff --git a/test/generators_test.py b/test/generators_test.py
@@ -252,9 +252,9 @@ def test_generated_target_names():
 
       We use the following target generation structure with differently named
     BBX targets:
-                       /---> BB1 ---\
+                       /---> BB1 ---\\
                 AAA --<----> BB2 ---->--> CCC --(composing)--> DDD
-                       \---> BB3 ---/
+                       \\---> BB3 ---/
 
       The extra generator at the end is needed because generating a top-level
     CCC target directly would requires us to explicitly specify a name for it.

diff --git a/test/testing.py b/test/testing.py
@@ -529,20 +529,20 @@ def write_subdir(dir):
     t.write("outside/project/Jamroot", "run ../other/test.cpp ;")
     t.run_build_system(["--dump-tests", "-n", "-d0"],
                        match=TestCmd.match_re, stdout=
-"""boost-test\(RUN\) ".*/pass-run" : "pass-run\.cpp"
-boost-test\(RUN_FAIL\) ".*/fail-run" : "fail-run\.cpp"
-boost-test\(LINK\) ".*/pass-link" : "pass-link\.cpp"
-boost-test\(LINK_FAIL\) ".*/fail-link" : "fail-link\.cpp"
-boost-test\(COMPILE\) ".*/pass-compile" : "pass-compile\.cpp"
-boost-test\(COMPILE_FAIL\) ".*/fail-compile" : "fail-compile\.cpp"
-boost-test\(RUN\) "any/test" : "libs/any/test\.cpp"
-boost-test\(RUN\) "any/test" : "libs/any/test/test\.cpp"
-boost-test\(RUN\) "any/test" : "libs/any/example/test\.cpp"
-boost-test\(RUN\) "bcp/test" : "tools/bcp/test/test\.cpp"
-boost-test\(RUN\) "bcp/test" : "tools/bcp/example/test\.cpp"
-boost-test\(RUN\) ".*/subdir/test/test" : "subdir/test/test\.cpp"
-boost-test\(RUN\) "test" : "status/test\.cpp"
-boost-test\(RUN\) ".*/outside/project/test" : "../other/test.cpp"
+"""boost-test\\(RUN\\) ".*/pass-run" : "pass-run\\.cpp"
+boost-test\\(RUN_FAIL\\) ".*/fail-run" : "fail-run\\.cpp"
+boost-test\\(LINK\\) ".*/pass-link" : "pass-link\\.cpp"
+boost-test\\(LINK_FAIL\\) ".*/fail-link" : "fail-link\\.cpp"
+boost-test\\(COMPILE\\) ".*/pass-compile" : "pass-compile\\.cpp"
+boost-test\\(COMPILE_FAIL\\) ".*/fail-compile" : "fail-compile\\.cpp"
+boost-test\\(RUN\\) "any/test" : "libs/any/test\\.cpp"
+boost-test\\(RUN\\) "any/test" : "libs/any/test/test\\.cpp"
+boost-test\\(RUN\\) "any/test" : "libs/any/example/test\\.cpp"
+boost-test\\(RUN\\) "bcp/test" : "tools/bcp/test/test\\.cpp"
+boost-test\\(RUN\\) "bcp/test" : "tools/bcp/example/test\\.cpp"
+boost-test\\(RUN\\) ".*/subdir/test/test" : "subdir/test/test\\.cpp"
+boost-test\\(RUN\\) "test" : "status/test\\.cpp"
+boost-test\\(RUN\\) ".*/outside/project/test" : "../other/test.cpp"
 """)
     t.cleanup()
 

diff --git a/test/timedata.py b/test/timedata.py
@@ -77,12 +77,12 @@ def basic_jam_action_test():
     t.write("baz", "nothing")
 
     expected_output = """\
-\.\.\.found 4 targets\.\.\.
-\.\.\.updating 2 targets\.\.\.
+\\.\\.\\.found 4 targets\\.\\.\\.
+\\.\\.\\.updating 2 targets\\.\\.\\.
 make bar
 time foo
-bar +user: [0-9\.]+ +system: +[0-9\.]+ +clock: +[0-9\.]+ *
-\.\.\.updated 2 targets\.\.\.$
+bar +user: [0-9.]+ +system: +[0-9.]+ +clock: +[0-9.]+ *
+\\.\\.\\.updated 2 targets\\.\\.\\.$
 """
 
     t.run_build_system(["-ffile.jam", "-d+1"], stdout=expected_output,

diff --git a/test/toolset-mock/src/MockProgram.py b/test/toolset-mock/src/MockProgram.py
@@ -190,7 +190,7 @@ def allow_properties(*args):
 # Use this in the stdout argument of command to print the command
 # for running another script.
 def script(name):
-    return os.path.join(os.path.dirname(__file__), "bin", re.sub('\.py$', '', name))
+    return os.path.join(os.path.dirname(__file__), "bin", re.sub('\\.py$', '', name))
 
 def match(command_line):
     for (p, stdout) in known_patterns: