diff --git a/scripts/testing_scripts/test_all_sandia b/scripts/testing_scripts/test_all_sandia index 06c202b97a1..81b56db7256 100755 --- a/scripts/testing_scripts/test_all_sandia +++ b/scripts/testing_scripts/test_all_sandia @@ -88,6 +88,8 @@ CXX_FLAGS_EXTRA="" LD_FLAGS_EXTRA="" KOKKOS_OPTIONS="" +CXX_STANDARD="c++11" + # # Handle arguments. # @@ -142,6 +144,9 @@ do --cxxflags-extra*) CXX_FLAGS_EXTRA="${key#*=}" ;; + --cxxstandard*) + CXX_STANDARD="${key#*=}" + ;; --ldflags-extra*) LD_FLAGS_EXTRA="${key#*=}" ;; @@ -631,6 +636,8 @@ single_build_and_test() { local cxxflags="${cxxflags} ${CXX_FLAGS_EXTRA}" local ldflags="${ldflags} ${LD_FLAGS_EXTRA}" + local cxx_standard="${CXX_STANDARD}" + if [[ "$KOKKOS_CUDA_OPTIONS" != "" ]]; then local extra_args="$extra_args $KOKKOS_CUDA_OPTIONS" fi @@ -652,7 +659,7 @@ single_build_and_test() { run_cmd ls fake_problem >& ${desc}.configure.log || { report_and_log_test_result 1 $desc configure && return 0; } fi else - run_cmd ${KOKKOS_PATH}/generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --ldflags=\"$ldflags\" $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; } + run_cmd ${KOKKOS_PATH}/generate_makefile.bash --with-devices=$build $ARCH_FLAG --compiler=$(which $compiler_exe) --cxxflags=\"$cxxflags\" --cxxstandard=\"$cxx_standard\" --ldflags=\"$ldflags\" $extra_args &>> ${desc}.configure.log || { report_and_log_test_result 1 ${desc} configure && return 0; } local -i build_start_time=$(date +%s) run_cmd make -j 48 build-test >& ${desc}.build.log || { report_and_log_test_result 1 ${desc} build && return 0; } local -i build_end_time=$(date +%s)