Fixed a CMake compile problem and modified a couple of autotest scripts
Added "make distclean" to the end of both the 'basictest.sh' and 'cmaketest.sh' autotest scripts to avoid situations where previously compiled test drivers are accidentally used in a test where the build failed.
This commit is contained in:
parent
a4a4268970
commit
6fd2bc1eeb
@ -99,3 +99,7 @@ for errfile in $( find $output_dir ! -size 0 -name "*.err" )
|
|||||||
do
|
do
|
||||||
echo $errfile >&2
|
echo $errfile >&2
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
( cd $src_dir; make distclean )
|
||||||
|
|
||||||
|
|||||||
@ -13,6 +13,8 @@
|
|||||||
|
|
||||||
testname=`basename $0 .sh`
|
testname=`basename $0 .sh`
|
||||||
|
|
||||||
|
drivers="ij new_ij sstruct struct ams_driver maxwell_unscaled sstruct_fac ij_mv struct_migrate"
|
||||||
|
|
||||||
# Echo usage information
|
# Echo usage information
|
||||||
case $1 in
|
case $1 in
|
||||||
-h|-help)
|
-h|-help)
|
||||||
@ -94,7 +96,7 @@ make $mopts install
|
|||||||
cd $src_dir/test/cmbuild
|
cd $src_dir/test/cmbuild
|
||||||
cmake ..
|
cmake ..
|
||||||
make $mopts
|
make $mopts
|
||||||
mv -f ij new_ij sstruct struct ams_driver maxwell_unscaled sstruct_fac ij_mv struct_migrate ..
|
mv -f $drivers ..
|
||||||
|
|
||||||
cd $test_dir
|
cd $test_dir
|
||||||
|
|
||||||
@ -115,3 +117,11 @@ for errfile in $( find $output_dir ! -size 0 -name "*.err" )
|
|||||||
do
|
do
|
||||||
echo $errfile >&2
|
echo $errfile >&2
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
cd $src_dir
|
||||||
|
rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
|
||||||
|
rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
|
||||||
|
rm -fr hypre
|
||||||
|
( cd $src_dir/test; rm -f $drivers; cleantest.sh )
|
||||||
|
|
||||||
|
|||||||
@ -773,7 +773,11 @@ if (HYPRE_USING_OPENMP)
|
|||||||
endif (HYPRE_USING_OPENMP)
|
endif (HYPRE_USING_OPENMP)
|
||||||
|
|
||||||
# Turn optimization off for this file
|
# Turn optimization off for this file
|
||||||
set_source_files_properties (lapack/dlamch.c PROPERTIES COMPILE_FLAGS /Od)
|
if (MSVC)
|
||||||
|
set_source_files_properties (lapack/dlamch.c PROPERTIES COMPILE_FLAGS /Od)
|
||||||
|
else ()
|
||||||
|
set_source_files_properties (lapack/dlamch.c PROPERTIES COMPILE_FLAGS -O0)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user