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

Move TARGETDIR as well

Browse Source
This commit is contained in:
Dan Sinclair 2019-10-15 16:47:28 -04:00
parent 167201430d
commit 3f072e158c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -197,4 +197,12 @@ if(BUILD_TESTING)
ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator) ENVIRONMENT GLSLANG_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/glslangValidator)
set_property(TEST glslang-testsuite APPEND PROPERTY set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap) ENVIRONMENT SPIRV_REMAP_PATH=${CMAKE_CURRENT_BINARY_DIR}/StandAlone/spirv-remap)
if (CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/localResults)
else(CMAKE_CONFIGURATION_TYPES)
set_property(TEST glslang-testsuite APPEND PROPERTY
ENVIRONMENT GLSLANG_TEST_RESULTS=${CMAKE_CURRENT_BINARY_DIR}/localResults)
endif(CMAKE_CONFIGURATION_TYPES)
endif(BUILD_TESTING) endif(BUILD_TESTING)

14
Test/runtests
View File

@ -1,11 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
TARGETDIR=localResults TARGETDIR=${GLSLANG_TEST_RESULTS:-localResults}
BASEDIR=baseResults BASEDIR=baseResults
EXE=${GLSLANG_PATH:-../build/install/bin/glslangValidator} EXE=${GLSLANG_PATH:-../build/install/bin/glslangValidator}
REMAPEXE=${SPIRV_REMAP_PATH:-../build/install/bin/spirv-remap} REMAPEXE=${SPIRV_REMAP_PATH:-../build/install/bin/spirv-remap}
HASERROR=0 HASERROR=0
mkdir -p localResults mkdir -p $TARGETDIR
if [ -a localtestlist ] if [ -a localtestlist ]
then then
@ -55,13 +55,13 @@ diff -b $BASEDIR/hlsl.automap.frag.out $TARGETDIR/hlsl.automap.frag.out || HASER
# multi-threaded test # multi-threaded test
# #
echo Comparing single thread to multithread for all tests in current directory... echo Comparing single thread to multithread for all tests in current directory...
$EXE -i -C *.vert *.geom *.frag *.tesc *.tese *.comp > singleThread.out $EXE -i -C *.vert *.geom *.frag *.tesc *.tese *.comp > $TARGETDIR/singleThread.out
$EXE -i -C *.vert *.geom *.frag *.tesc *.tese *.comp -t > multiThread.out $EXE -i -C *.vert *.geom *.frag *.tesc *.tese *.comp -t > $TARGETDIR/multiThread.out
diff singleThread.out multiThread.out || HASERROR=1 diff $TARGETDIR/singleThread.out $TARGETDIR/multiThread.out || HASERROR=1
if [ $HASERROR -eq 0 ] if [ $HASERROR -eq 0 ]
then then
rm singleThread.out rm $TARGETDIR/singleThread.out
rm multiThread.out rm $TARGETDIR/multiThread.out
fi fi
# #