CFD/hypre
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to cmake autotests with updated test build.

Browse Source
This commit is contained in:
Sarah Virginia Osborn 2019-08-20 11:20:30 -07:00
parent 80b78ed98b
commit 06c43e4ce3
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AUTOTEST/cmake.bat
View File

@ -37,27 +37,20 @@ mkdir %outdir%
rem clean out 'cmbuild' directories rem clean out 'cmbuild' directories
cd %srcdir% && rmdir /s /q cmbuild & mkdir cmbuild cd %srcdir% && rmdir /s /q cmbuild & mkdir cmbuild
cd %srcdir%\test && rmdir /s /q cmbuild & mkdir cmbuild
rem run cmake for hypre library and test directory rem run cmake for hypre library and test directory
cd %srcdir%\cmbuild cd %srcdir%\cmbuild
%CMAKE% -G "Visual Studio 15 2017" %cmakeopts% .. > %outdir%\lib-cmake.out %CMAKE% -G "Visual Studio 15 2017" %cmakeopts% "-DHYPRE_BUILD_TESTS=ON" .. > %outdir%\lib-cmake.out
cd %srcdir%\test\cmbuild
%CMAKE% -G "Visual Studio 15 2017" %cmakeopts% .. > %outdir%\test-cmake.out
rem build release version rem build release version
cd %srcdir%\cmbuild cd %srcdir%\cmbuild
%MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Release > %outdir%\lib-release.out %MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Release > %outdir%\lib-release.out
%MSBUILD% INSTALL.vcxproj /p:Configuration=Release >> %outdir%\lib-release.out %MSBUILD% INSTALL.vcxproj /p:Configuration=Release >> %outdir%\lib-release.out
cd %srcdir%\test\cmbuild
%MSBUILD% ALL_BUILD.vcxproj /t:Rebuild /p:Configuration=Release > %outdir%\test-release.out
rem build debug version rem build debug version
cd %srcdir%\cmbuild cd %srcdir%\cmbuild
%MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Debug > %outdir%\lib-debug.out %MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Debug > %outdir%\lib-debug.out
%MSBUILD% INSTALL.vcxproj /p:Configuration=Debug >> %outdir%\lib-debug.out %MSBUILD% INSTALL.vcxproj /p:Configuration=Debug >> %outdir%\lib-debug.out
cd %srcdir%\test\cmbuild
%MSBUILD% ALL_BUILD.vcxproj /t:Rebuild /p:Configuration=Release > %outdir%\test-debug.out
rem create error file - inspect output file lines with "Error(s)" substring rem create error file - inspect output file lines with "Error(s)" substring
cd %rundir% cd %rundir%

9
AUTOTEST/cmake.sh
View File

@ -37,7 +37,7 @@ src_dir=`cd $1; pwd`
shift shift
# Parse the rest of the command line # Parse the rest of the command line
copts="" copts="-DHYPRE_BUILD_TESTS=ON"
mopts="" mopts=""
ropts="" ropts=""
eopts="" eopts=""
@ -74,7 +74,6 @@ src_dir=`pwd`
# Clean up the cmbuild directories (do it from src_dir as a precaution) # Clean up the cmbuild directories (do it from src_dir as a precaution)
cd $src_dir cd $src_dir
rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'` rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
# Clean up the previous install # Clean up the previous install
cd $src_dir cd $src_dir
@ -86,10 +85,9 @@ cmake $copts ..
make $mopts install make $mopts install
# Make # Make
cd $src_dir/test/cmbuild cd $src_dir/cmbuild/test
cmake ..
make $mopts make $mopts
mv -f $drivers .. mv -f $drivers ../../test
cd $test_dir cd $test_dir
@ -114,7 +112,6 @@ done
# Clean up # Clean up
cd $src_dir cd $src_dir
rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'` rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
rm -fr hypre rm -fr hypre
( cd $src_dir/test; rm -f $drivers; ./cleantest.sh ) ( cd $src_dir/test; rm -f $drivers; ./cleantest.sh )