Skip to content

Commit

Permalink
Cleaning up based on PR feedback
Browse files Browse the repository at this point in the history
SQAUSH before merging

I overlooked cleaning up the CMakeLists.txt in the debug test case
directory. This fixes that oversight.

Signed-off-by: Brian Atkinson <batkinson@lanl.gov>
  • Loading branch information
bwatkinson committed Jul 27, 2023
1 parent c0e4e01 commit d5fe9d7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 33 deletions.
32 changes: 0 additions & 32 deletions tests/debug/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,7 @@
#configure_file(common.sh common.sh)

set(DEBUG_TESTS
test_xdd_debug_init.sh
)

# original tests depended on xdd being installed
option(TEST_INSTALLED "Use installed xdd for tests" ON)
if (TEST_INSTALLED)
set(XDD_EXEC "$<TARGET_FILE:xdd>")
else()
set(XDD_EXEC "${CMAKE_BINARY_DIR}/bin/xdd")
endif()

# configurable output directory
#set(TESTDIR "${CMAKE_BINARY_DIR}/test-dir" CACHE PATH "Where to place test files")
#add_custom_target(mk-test-dir ALL
# COMMAND "${CMAKE_COMMAND}" -E make_directory "${TESTDIR}")

# not configurable
#set(TESTDIR_TESTS "${TESTDIR}/tests")
#add_custom_target(mk-test-tests ALL
# COMMAND "${CMAKE_COMMAND}" -E make_directory "${TESTDIR_TESTS}"
# DEPENDS mk-test-dir)
#set(TESTDIR_LOGS "${TESTDIR}/logs")
#add_custom_target(mk-test-logs ALL
# COMMAND "${CMAKE_COMMAND}" -E make_directory "${TESTDIR_LOGS}"
# DEPENDS mk-test-dir)

# generate config file
#file(GENERATE
# OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test_config"
# CONTENT "XDDTEST_XDD_EXE=${XDD_EXEC}
#XDDTEST_LOCAL_MOUNT=${TESTDIR}/tests
#XDDTEST_OUTPUT_DIR=${TESTDIR}/logs"
#)
foreach(TEST ${DEBUG_TESTS})
configure_file("${TEST}" "${TEST}" COPYONLY)
add_test(NAME "${TEST}"
Expand Down
1 change: 0 additions & 1 deletion tests/debug/test_xdd_debug_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ ${xdd_cmd} 2>&1 | grep "bound to NUMA node"

if [[ $? -ne 0 ]]; then
# test failed
echo "We are here with $? which is not equal to zero..."
finalize_test 1
fi

Expand Down

0 comments on commit d5fe9d7

Please sign in to comment.