mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use commandline options instead of ENV variables

Browse Source
This commit is contained in:
Dan Sinclair 2019-10-16 13:08:48 -04:00
parent 7d623e1c90
commit 3290d38011
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -189,24 +189,17 @@ if(BUILD_TESTING)
set(IGNORE_CR_FLAG -o igncr) set(IGNORE_CR_FLAG -o igncr)
endif() endif()
add_test(NAME glslang-testsuite
COMMAND bash ${IGNORE_CR_FLAG} runtests
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Test/)
if (CMAKE_CONFIGURATION_TYPES) if (CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY set(RESULTS_PATH ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults)
ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/glslangValidator) set(VALIDATOR_PATH ${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/glslangValidator)
set_property(TEST glslang-testsuite APPEND PROPERTY set(REMAP_PATH ${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/spirv-remap)
ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/$<CONFIGURATION>/spirv-remap)
set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults)
else(CMAKE_CONFIGURATION_TYPES) else(CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY set(RESULTS_PATH ${CMAKE_CURRENT_BINARY_DIR}/localResults)
ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator) set(VALIDATOR_PATH ${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator)
set_property(TEST glslang-testsuite APPEND PROPERTY set(REMAP_PATH ${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/localResults)
endif(CMAKE_CONFIGURATION_TYPES) endif(CMAKE_CONFIGURATION_TYPES)
add_test(NAME glslang-testsuite
COMMAND bash ${IGNORE_CR_FLAG} runtests ${RESULTS_PATH} ${VALIDATOR_PATH} ${REMAP_PATH}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Test/)
endif(BUILD_TESTING) endif(BUILD_TESTING)

11
Test/runtests
View File

@ -1,9 +1,14 @@
#!/usr/bin/env bash #!/usr/bin/env bash
TARGETDIR=${GLSLANG_TEST_RESULTS:-localResults} # Arguments:
# 1- TargetDirectory, where to write test results and intermediary files
# 2- Path to glslangValidator
# 3- Path to spirv-remap
TARGETDIR=${1:-localResults}
BASEDIR=baseResults BASEDIR=baseResults
EXE=${GLSLANG_PATH:-../build/install/bin/glslangValidator} EXE=${2:-../build/install/bin/glslangValidator}
REMAPEXE=${SPIRV_REMAP_PATH:-../build/install/bin/spirv-remap} REMAPEXE=${3:-../build/install/bin/spirv-remap}
HASERROR=0 HASERROR=0
mkdir -p $TARGETDIR mkdir -p $TARGETDIR