Skip to content

Commit

Permalink
More updates based on PR feedback
Browse files Browse the repository at this point in the history
SQUASH before merging

Made updates to test_xdd_debug_init.sh to just call XDD directly without
putting it in a string first.

Not sure what the idea was behind the redirection of the shell scripts
to the log file was. As fas as I can tell, it never resulted in anything
being written out to test-dir/logs. For now, I am just getting rid of
the redirection till someone can show me what it was suppose to do.

Signed-off-by: Brian Atkinson <batkinson@lanl.gov>
  • Loading branch information
bwatkinson committed Jul 27, 2023
1 parent d5fe9d7 commit 0753d88
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion tests/debug/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set(DEBUG_TESTS
foreach(TEST ${DEBUG_TESTS})
configure_file("${TEST}" "${TEST}" COPYONLY)
add_test(NAME "${TEST}"
COMMAND sh -c "${CMAKE_CURRENT_BINARY_DIR}/${TEST} 2> ${TESTDIR}/logs/${TEST}.log"
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
set_tests_properties("${TEST}" PROPERTIES LABELS "debug")
set_tests_properties("${TEST}" PROPERTIES SKIP_RETURN_CODE 255)
Expand Down
8 changes: 4 additions & 4 deletions tests/debug/test_xdd_debug_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ initialize_test

echo "Foobar and I am here motherfucker"

xdd_cmd="${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose -debug INIT"
${xdd_cmd} 2>&1 | grep "bound to NUMA node"
${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose -debug INIT \
2>&1 | grep "bound to NUMA node"

if [[ $? -ne 0 ]]; then
# test failed
finalize_test 1
fi

xdd_cmd="${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose"
${xdd_cmd} 2>&1 | grep "bound to NUMA node"
${XDDTEST_XDD_EXE} -op write -reqsize 128 -numreqs 1 -targets 1 /dev/null -verbose \
2>&1 | grep "bound to NUMA node"

if [[ $? -ne 1 ]]; then
# test failed
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ set(FUNCTIONAL
foreach(TEST ${FUNCTIONAL})
configure_file("${TEST}" "${TEST}" COPYONLY)
add_test(NAME "${TEST}"
COMMAND sh -c "${CMAKE_CURRENT_BINARY_DIR}/${TEST} 2> ${TESTDIR}/logs/${TEST}.log"
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${TEST}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
set_tests_properties("${TEST}" PROPERTIES LABELS "functional")
set_tests_properties("${TEST}" PROPERTIES SKIP_RETURN_CODE 255)
Expand Down

0 comments on commit 0753d88

Please sign in to comment.