Skip to content

Commit 5378456

Browse files
kdudkakdudka
committed
tests: eliminate remaining uses of ${testdir}
1 parent 01e95dd commit 5378456

File tree

3 files changed

+72
-73
lines changed

3 files changed

+72
-73
lines changed

‎tests/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
set(csdiff "${CMAKE_BINARY_DIR}/src/csdiff")
2020
set(csgrep "${CMAKE_BINARY_DIR}/src/csgrep")
2121
set(cssort "${CMAKE_BINARY_DIR}/src/cssort")
22-
set(testdir "${CMAKE_CURRENT_SOURCE_DIR}")
2322
set(csjson "${csgrep} --mode=json")
2423
set(diffcmd "diff -up")
2524

‎tests/csgrep/CMakeLists.txt

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -21,91 +21,91 @@ macro(test_csparser dir num)
2121

2222
set(cmd "${csgrep} ${tst}-stdin.txt 2>/dev/null")
2323
set(cmd "${cmd} | ${diffcmd} ${tst}-stdout.txt -")
24-
add_test_wrap("${dir}-${num}-stdout" "${cmd}")
24+
add_test_wrap("csgrep/${dir}-${num}-stdout" "${cmd}")
2525

2626
set(cmd "${csgrep} ${tst}-stdin.txt 2>&1 >/dev/null")
2727
set(cmd "${cmd} | sed -s 's|^[^:]*/||' | ${diffcmd} ${tst}-stderr.txt -")
28-
add_test_wrap("${dir}-${num}-stderr" "${cmd}")
28+
add_test_wrap("csgrep/${dir}-${num}-stderr" "${cmd}")
2929
endmacro()
3030

3131
# a generic template for csgrep test-cases
32-
macro(test_csgrep dir num)
33-
set(tst "${testdir}/${dir}/${num}")
32+
macro(test_csgrep num)
33+
set(tst "${CMAKE_CURRENT_SOURCE_DIR}/${num}")
3434

3535
file(READ ${tst}-args.txt args)
3636
string(REPLACE "\n" "" args "${args}")
3737
set(cmd "${csgrep} ${args} ${tst}-stdin.txt")
3838
set(cmd "${cmd} | ${jsfilter} | ${diffcmd} ${tst}-stdout.txt -")
39-
add_test_wrap("${dir}-${num}" "${cmd}")
39+
add_test_wrap("csgrep/${num}" "${cmd}")
4040
endmacro()
4141

4242
# csgrep tests
4343
test_csparser(csparser-5.8 00)
4444
test_csparser(csparser-5.8 01)
4545
test_csparser(csparser-5.8 02)
46-
test_csgrep(csgrep "00-exclude-conftest" )
47-
test_csgrep(csgrep "01-remove-duplicates" )
48-
test_csgrep(csgrep "02-compiler-warnings" )
49-
test_csgrep(csgrep "03-compiler-warnings" )
50-
test_csgrep(csgrep "04-compiler-warnings" )
51-
test_csgrep(csgrep "05-compiler-warnings" )
52-
test_csgrep(csgrep "06-cppcheck-warnings" )
53-
test_csgrep(csgrep "07-cppcheck-warnings" )
54-
test_csgrep(csgrep "08-cppcheck-warnings" )
55-
test_csgrep(csgrep "09-err-file-comments" )
56-
test_csgrep(csgrep "10-err-file-comments" )
57-
test_csgrep(csgrep "11-err-file-comments" )
58-
test_csgrep(csgrep "12-llvm-build-warnings" )
59-
test_csgrep(csgrep "13-llvm-build-warnings" )
60-
test_csgrep(csgrep "14-llvm-build-warnings" )
61-
test_csgrep(csgrep "15-llvm-build-warnings" )
62-
test_csgrep(csgrep "16-compiler-warnings" )
63-
test_csgrep(csgrep "17-compiler-warnings" )
64-
test_csgrep(csgrep "18-compiler-warnings" )
65-
test_csgrep(csgrep "19-clang-warnings" )
66-
test_csgrep(csgrep "20-clang-warnings" )
67-
test_csgrep(csgrep "21-compiler-warnings" )
68-
test_csgrep(csgrep "22-compiler-warnings" )
69-
test_csgrep(csgrep "23-clang-warnings" )
70-
test_csgrep(csgrep "24-compiler-warnings" )
71-
test_csgrep(csgrep "25-compiler-warnings" )
72-
test_csgrep(csgrep "26-cov-format-errors" )
73-
test_csgrep(csgrep "27-cov-format-errors" )
74-
test_csgrep(csgrep "28-cov-format-errors" )
75-
test_csgrep(csgrep "29-cov-format-errors" )
76-
test_csgrep(csgrep "30-prospector-raw" )
77-
test_csgrep(csgrep "31-prospector-err" )
78-
test_csgrep(csgrep "32-shellcheck-raw" )
79-
test_csgrep(csgrep "33-cov-format-errors" )
80-
test_csgrep(csgrep "34-csgrep-color" )
81-
test_csgrep(csgrep "35-cov-format-errors" )
82-
test_csgrep(csgrep "36-csgrep-json" )
83-
test_csgrep(csgrep "37-csgrep-json" )
84-
test_csgrep(csgrep "38-csparser-remediation" )
85-
test_csgrep(csgrep "39-csparser-remediation" )
86-
test_csgrep(csgrep "40-csparser-code-snippet" )
87-
test_csgrep(csgrep "41-gcc-parser-pylint" )
88-
test_csgrep(csgrep "42-gcc-parser-smatch" )
89-
test_csgrep(csgrep "43-gcc-parser-smatch" )
90-
test_csgrep(csgrep "44-csparser-new-key-evts" )
91-
test_csgrep(csgrep "45-gcc-parser-clang" )
92-
test_csgrep(csgrep "46-cov-json-v2" )
93-
test_csgrep(csgrep "47-csparser-new-key-evts" )
94-
test_csgrep(csgrep "48-csparser-missing-break-key-evt")
95-
test_csgrep(csgrep "49-csparser-findbugs-jsr166" )
96-
test_csgrep(csgrep "50-gcc-parser-gcc-9.2.1" )
97-
test_csgrep(csgrep "51-gcc-parser-systemd" )
98-
test_csgrep(csgrep "52-gcc-parser-clang-nss" )
99-
test_csgrep(csgrep "53-csparser-note-events" )
100-
test_csgrep(csgrep "54-csparser-unknown-lineno" )
101-
test_csgrep(csgrep "55-csparser-pylint-copr" )
102-
test_csgrep(csgrep "56-gcc-sparser-clang-error" )
103-
test_csgrep(csgrep "57-gcc-parser-gcc-analyzer-curl")
104-
test_csgrep(csgrep "58-csparser-gcc-analyzer-curl")
105-
test_csgrep(csgrep "59-json-parser-cov-v7-cwe" )
106-
test_csgrep(csgrep "60-gcc-parser-cppcheck-cwe" )
107-
test_csgrep(csgrep "61-json-parser-cov-v7-lang" )
108-
test_csgrep(csgrep "62-csparser-checker-lang" )
109-
test_csgrep(csgrep "63-gcc-parser-checker-lang" )
110-
test_csgrep(csgrep "64-json-parser-unknown-node" )
111-
test_csgrep(csgrep "65-gcc-parser-clang-warn-suff")
46+
test_csgrep("00-exclude-conftest" )
47+
test_csgrep("01-remove-duplicates" )
48+
test_csgrep("02-compiler-warnings" )
49+
test_csgrep("03-compiler-warnings" )
50+
test_csgrep("04-compiler-warnings" )
51+
test_csgrep("05-compiler-warnings" )
52+
test_csgrep("06-cppcheck-warnings" )
53+
test_csgrep("07-cppcheck-warnings" )
54+
test_csgrep("08-cppcheck-warnings" )
55+
test_csgrep("09-err-file-comments" )
56+
test_csgrep("10-err-file-comments" )
57+
test_csgrep("11-err-file-comments" )
58+
test_csgrep("12-llvm-build-warnings" )
59+
test_csgrep("13-llvm-build-warnings" )
60+
test_csgrep("14-llvm-build-warnings" )
61+
test_csgrep("15-llvm-build-warnings" )
62+
test_csgrep("16-compiler-warnings" )
63+
test_csgrep("17-compiler-warnings" )
64+
test_csgrep("18-compiler-warnings" )
65+
test_csgrep("19-clang-warnings" )
66+
test_csgrep("20-clang-warnings" )
67+
test_csgrep("21-compiler-warnings" )
68+
test_csgrep("22-compiler-warnings" )
69+
test_csgrep("23-clang-warnings" )
70+
test_csgrep("24-compiler-warnings" )
71+
test_csgrep("25-compiler-warnings" )
72+
test_csgrep("26-cov-format-errors" )
73+
test_csgrep("27-cov-format-errors" )
74+
test_csgrep("28-cov-format-errors" )
75+
test_csgrep("29-cov-format-errors" )
76+
test_csgrep("30-prospector-raw" )
77+
test_csgrep("31-prospector-err" )
78+
test_csgrep("32-shellcheck-raw" )
79+
test_csgrep("33-cov-format-errors" )
80+
test_csgrep("34-csgrep-color" )
81+
test_csgrep("35-cov-format-errors" )
82+
test_csgrep("36-csgrep-json" )
83+
test_csgrep("37-csgrep-json" )
84+
test_csgrep("38-csparser-remediation" )
85+
test_csgrep("39-csparser-remediation" )
86+
test_csgrep("40-csparser-code-snippet" )
87+
test_csgrep("41-gcc-parser-pylint" )
88+
test_csgrep("42-gcc-parser-smatch" )
89+
test_csgrep("43-gcc-parser-smatch" )
90+
test_csgrep("44-csparser-new-key-evts" )
91+
test_csgrep("45-gcc-parser-clang" )
92+
test_csgrep("46-cov-json-v2" )
93+
test_csgrep("47-csparser-new-key-evts" )
94+
test_csgrep("48-csparser-missing-break-key-evt" )
95+
test_csgrep("49-csparser-findbugs-jsr166" )
96+
test_csgrep("50-gcc-parser-gcc-9.2.1" )
97+
test_csgrep("51-gcc-parser-systemd" )
98+
test_csgrep("52-gcc-parser-clang-nss" )
99+
test_csgrep("53-csparser-note-events" )
100+
test_csgrep("54-csparser-unknown-lineno" )
101+
test_csgrep("55-csparser-pylint-copr" )
102+
test_csgrep("56-gcc-sparser-clang-error" )
103+
test_csgrep("57-gcc-parser-gcc-analyzer-curl" )
104+
test_csgrep("58-csparser-gcc-analyzer-curl" )
105+
test_csgrep("59-json-parser-cov-v7-cwe" )
106+
test_csgrep("60-gcc-parser-cppcheck-cwe" )
107+
test_csgrep("61-json-parser-cov-v7-lang" )
108+
test_csgrep("62-csparser-checker-lang" )
109+
test_csgrep("63-gcc-parser-checker-lang" )
110+
test_csgrep("64-json-parser-unknown-node" )
111+
test_csgrep("65-gcc-parser-clang-warn-suff" )

‎tests/cstrans-df-run/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# a generic template for cstrans-df-run tests
1919
macro(tests_cstrans_df_run tst)
20-
set(test_data_prefix "${testdir}/cstrans-df-run/${tst}")
20+
set(test_data_prefix "${CMAKE_CURRENT_SOURCE_DIR}/${tst}")
2121
set(cmd "${CMAKE_BINARY_DIR}/src/cstrans-df-run")
2222
set(cmd "${cmd} -- /opt/cov-sa-2019.09/bin/cov-build --dir=/cov --append-log")
2323
set(cmd "${cmd} <${test_data_prefix}-stdin.txt")

0 commit comments

Comments
 (0)