awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix STRICT_TESTS (#2338) 

STRICT_TESTS was introduced in commit c22b93963. Some people have setups
where e.g. fontconfig produces warnings. These warnings made the tests
under tests/examples/ fail. The above commit changes things so that
these warnings are ignored by default, unless STRICT_TESTS is enabled.

Commit b5ca8bf937 broke this by making example test failures fatal
again.

Fix this by appending "|| true" to the command to run in case strict
tests are disabled. Thus, all failures from tests/examples/runner.sh get
ignored.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2018-08-06 15:05:51 +02:00 committed by Emmanuel Lepage Vallée
parent dd7161ee0a
commit 73b519d38b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/examples/CMakeLists.txt
View File

@ -45,6 +45,12 @@ else()
set(LUA_COV_RUNNER lua) set(LUA_COV_RUNNER lua)
endif() endif()
if (STRICT_TESTS)
set(IGNORE_ERRORS)
else()
set(IGNORE_ERRORS "||" "true")
endif()
# Add the main awesome lua libraries. # Add the main awesome lua libraries.
set(LUA_PATH_ "\ set(LUA_PATH_ "\
${TOP_SOURCE_DIR}/lib/?.lua\\;\ ${TOP_SOURCE_DIR}/lib/?.lua\\;\
@ -205,7 +211,7 @@ function(run_test test_path namespace escaped_content)
message(STATUS "Running ${rel_test_path}…") message(STATUS "Running ${rel_test_path}…")
execute_process( execute_process(
COMMAND "${TOP_SOURCE_DIR}/tests/examples/runner.sh" "${expected_output_path}" ${LUA_COV_RUNNER} ${template} ${test_path} ${IMAGE_PATH} COMMAND "${TOP_SOURCE_DIR}/tests/examples/runner.sh" "${expected_output_path}" ${LUA_COV_RUNNER} ${template} ${test_path} ${IMAGE_PATH} ${IGNORE_ERRORS}
RESULT_VARIABLE TEST_RESULT RESULT_VARIABLE TEST_RESULT
OUTPUT_VARIABLE TEST_OUTPUT OUTPUT_VARIABLE TEST_OUTPUT
ERROR_VARIABLE TEST_ERROR ERROR_VARIABLE TEST_ERROR
@ -276,7 +282,7 @@ function(run_test test_path namespace escaped_content)
file(RELATIVE_PATH rel_template "${TOP_SOURCE_DIR}" "${template}") file(RELATIVE_PATH rel_template "${TOP_SOURCE_DIR}" "${template}")
file(RELATIVE_PATH rel_output "${TOP_SOURCE_DIR}" "${OUTPUT_IMAGE_PATH}") file(RELATIVE_PATH rel_output "${TOP_SOURCE_DIR}" "${OUTPUT_IMAGE_PATH}")
add_custom_command( add_custom_command(
COMMAND ${LUA_COV_RUNNER} ${template} ${test_path} ${IMAGE_PATH} COMMAND ${LUA_COV_RUNNER} ${template} ${test_path} ${IMAGE_PATH} ${IGNORE_ERRORS}
COMMENT "Generating ${rel_output} (via ${rel_test_path} (${rel_template}))" COMMENT "Generating ${rel_output} (via ${rel_test_path} (${rel_template}))"
DEPENDS ${template} ${test_path} DEPENDS ${template} ${test_path}
OUTPUT ${OUTPUT_IMAGE_PATH} OUTPUT ${OUTPUT_IMAGE_PATH}