Skip to content

Commit 4b174d5

Browse files
authored
Fix several tests failing due to missing CMAKE_OBJDUMP in CMake test fixture (#73)
In #37, test_suite.py started requiring the CMAKE_OBJDUMP variable from the set of CMake variables. Various tests were using a fake CMake test fixture which defines various CMake variables, however CMAKE_OBJDUMP wasn't added in #47, breaking a bunch of tests. This was probably never noticed because the tests were completely broken back then, I assume they were not being run on a regular basis.
1 parent 2b61b2b commit 4b174d5

File tree

6 files changed

+2
-10
lines changed

6 files changed

+2
-10
lines changed

tests/runtest/Inputs/test-suite-cmake/fake-cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ then
4949
if [[ $CMAKE_C_COMPILER_TARGET != "notfound" ]]; then
5050
echo CMAKE_C_COMPILER_TARGET:STRING=$CMAKE_C_COMPILER_TARGET
5151
fi
52+
echo CMAKE_OBJDUMP:FILEPATH=objdump
5253
echo CMAKE_BUILD_TYPE:STRING=RelWithDebInfo
5354
echo CMAKE_C_FLAGS:STRING=-O0
5455
echo CMAKE_CXX_FLAGS:STRING=
@@ -67,6 +68,7 @@ else
6768
echo "Dummy" > CMakeCache.txt
6869
echo CMAKE_C_COMPILER:FILEPATH=$CMAKE_C_COMPILER >> CMakeCache.txt
6970
echo CMAKE_CXX_COMPILER:FILEPATH=$CMAKE_CXX_COMPILER >> CMakeCache.txt
71+
echo CMAKE_OBJDUMP:FILEPATH=objdump >> CMakeCache.txt
7072
if [[ $CMAKE_C_COMPILER_TARGET != "notfound" ]]; then
7173
echo CMAKE_C_COMPILER_TARGET:STRING=$CMAKE_C_COMPILER_TARGET >> CMakeCache.txt
7274
fi

tests/runtest/test_suite-compile-only.shtest

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# XFAIL: TODO-FIXME
2-
31
# Check running with compile only
42
# RUN: rm -rf %t.SANDBOX
53
# RUN: lnt runtest test-suite \

tests/runtest/test_suite-perf-events.shtest

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# XFAIL: TODO-FIXME
2-
31
# Check specifying which linux perf events to measure
42
# RUN: rm -rf %t.SANDBOX
53
# RUN: lnt runtest test-suite \

tests/runtest/test_suite-pgo.shtest

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# XFAIL: TODO-FIXME
2-
31
# Check running with PGO
42
# RUN: rm -rf %t.SANDBOX
53
# RUN: lnt runtest test-suite \

tests/runtest/test_suite-profile-import.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# XFAIL: TODO-FIXME
2-
31
# Check importing test-suite profiles into db
42
# RUN: rm -rf %t.SANDBOX
53
# RUN: lnt runtest test-suite \

tests/runtest/test_suite-profile.shtest

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# XFAIL: TODO-FIXME
2-
31
# Check importing profiles
42
# RUN: rm -rf %t.SANDBOX
53
# RUN: lnt runtest test-suite \

0 commit comments

Comments
 (0)