Merge pull request #1911 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'e6c11af8704c3ac923dd6afcefaf20c568157770':
  Fix namespace usage
  Fix EXISTS test syntax
  Update settings
  Add 32-bit cross-compile toolchain

1 files changed, 4 insertions, 4 deletions

diff --git a/config/cmake/volTest.cmake b/config/cmake/volTest.cmake
index 6554f00..1dcd2b1 100644
--- a/config/cmake/volTest.cmake
+++ b/config/cmake/volTest.cmake
@@ -23,11 +23,11 @@ if (NOT TEST_VOL)
   message (FATAL_ERROR "Require TEST_VOL to be defined")
 endif ()
 
-if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}")
   file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
 endif ()
 
-if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
   file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
 endif ()
 
@@ -54,7 +54,7 @@ execute_process (
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
 # if the .err file exists and ERRROR_APPEND is enabled
-if (ERROR_APPEND AND EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+if (ERROR_APPEND AND EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.err")
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
   file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}.out "${TEST_STREAM}")
 endif ()
@@ -62,7 +62,7 @@ endif ()
 # if the return value is !=${TEST_EXPECT} bail out
 if (NOT TEST_RESULT EQUAL TEST_EXPECT)
   if (NOT TEST_NOERRDISPLAY)
-    if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.out)
+    if (EXISTS "${TEST_FOLDER}/${TEST_OUTPUT}.out")
       file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.out TEST_STREAM)
     message (STATUS "Output USING ${TEST_VOL}:\n${TEST_STREAM}")
     endif ()