Merge pull request #2495 from hmakholm/pr/update-c-test

C++ tests: generalize arguments tests

Author: geoffw0

cpp/ql/test/library-tests/arguments/arguments.expected

@@ -12,7 +12,7 @@
 | arguments.c | 12 | linux_x86_64 |
 | arguments.c | 13 | --gcc |
 | arguments.c | 14 | --predefined_macros |
-| arguments.c | 15 | <root>/tools/qltest/predefined_macros |
+| arguments.c | 15 | <tools>/qltest/predefined_macros |
 | arguments.c | 16 | -w |
 | arguments.c | 17 | -Werror |
 | arguments.c | 18 | arguments.c |

cpp/ql/test/library-tests/arguments/arguments.ql

@@ -7,5 +7,5 @@ where
   s = c
         .getArgument(i)
         .replaceAll("\\", "/")
-        .regexpReplaceAll(".*(tools/qltest/predefined_macros)", "<root>/$1")
+        .regexpReplaceAll(".*(/qltest/predefined_macros)", "<tools>$1")
 select c.getAFileCompiled().toString(), i, s