songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed redundant arguments to cmake

This commit is contained in:
Efi Fogel 2009-07-08 11:50:27 +00:00
parent fc00db5b80
commit 2f2ccdbe3a
1 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Snap_rounding_2/test/Snap_rounding_2/cgal_test_base
View File

@ -23,19 +23,16 @@ fi
configure() configure()
{ {
echo "Configuring... " echo "Configuring... "
if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ if eval 'cmake "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" \ -DCGAL_DIR="$CGAL_DIR" \
-DCGAL_CXX_FLAGS:STRING="$TESTSUITE_CXXFLAGS" \
-DCGAL_EXE_LINKER_FLAGS="$TESTSUITE_LDFLAGS" \
-DCMAKE_BUILD_TYPE=NOTFOUND \
.' ; then .' ; then
echo " succesful configuration" >> $ERRORFILE echo " succesful configuration" >> $ERRORFILE
else else
echo " ERROR: configuration" >> $ERRORFILE echo " ERROR: configuration" >> $ERRORFILE
fi fi
} }
@ -51,22 +48,21 @@ compile()
if [ "${TEST_WITH_CMAKE}" != "FALSE" ]; then if [ "${TEST_WITH_CMAKE}" != "FALSE" ]; then
export TESTSUITE_CXXFLAGS="-DCGAL_SNAP_ROUNDING_TEST=$2" export TESTSUITE_CXXFLAGS="-DCGAL_SNAP_ROUNDING_TEST=$2"
configure configure
if eval '${MAKE_CMD} VERBOSE=1 -fMakefile \ if eval '${MAKE_CMD} VERBOSE=1 -fMakefile $1' ; then
$1' ; then echo " compilation of $1 succeeded" >> $ERRORFILE
echo " compilation of $1 succeeded" >> $ERRORFILE else
else echo " ERROR: compilation of $1 failed" >> $ERRORFILE
echo " ERROR: compilation of $1 failed" >> $ERRORFILE fi
fi else
else if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \
if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \ TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \
TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \ TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then
TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then echo " compilation of $1 succeeded" >> $ERRORFILE
echo " compilation of $1 succeeded" >> $ERRORFILE else
else echo " ERROR: compilation of $1 failed" >> $ERRORFILE
echo " ERROR: compilation of $1 failed" >> $ERRORFILE fi
fi
fi fi
} }
@ -88,16 +84,16 @@ run()
echo "Executing ./$1 $DATAFILE > ${data_dir}/out" echo "Executing ./$1 $DATAFILE > ${data_dir}/out"
echo echo
if eval 2>&1 $COMMAND > $OUTPUTFILE ; then if eval 2>&1 $COMMAND > $OUTPUTFILE ; then
echo " execution of $1 ${data_dir}/$DATATFILE > ${data_dir}/out succeeded" >> $ERRORFILE echo " execution of $1 ${data_dir}/$DATATFILE > ${data_dir}/out succeeded" >> $ERRORFILE
if ${CMP} ${data_dir}/out "${data_dir}/gold_$DATANAME" ; then if ${CMP} ${data_dir}/out "${data_dir}/gold_$DATANAME" ; then
echo " no differences between output and gold were found" >> $ERRORFILE echo " no differences between output and gold were found" >> $ERRORFILE
else else
echo " ERROR: differences between output and gold were found" >> $ERRORFILE echo " ERROR: differences between output and gold were found" >> $ERRORFILE
echo " ERROR: differences between output and gold were found :" >> $OUTPUTFILE echo " ERROR: differences between output and gold were found :" >> $OUTPUTFILE
diff ${data_dir}/out "${data_dir}/gold_$DATANAME" >> $OUTPUTFILE diff ${data_dir}/out "${data_dir}/gold_$DATANAME" >> $OUTPUTFILE
fi fi
else else
echo " ERROR: execution of $1 $DATAFILE $2 ${data_dir}/out failed" >> $ERRORFILE echo " ERROR: execution of $1 $DATAFILE $2 ${data_dir}/out failed" >> $ERRORFILE
fi fi
else else
echo " ERROR: could not execute $1" >> $ERRORFILE echo " ERROR: could not execute $1" >> $ERRORFILE
@ -117,18 +113,18 @@ run()
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
if [ $# -ne 0 ] ; then if [ $# -ne 0 ] ; then
case $1 in case $1 in
-cmake) TEST_WITH_CMAKE="TRUE" ;; -cmake) TEST_WITH_CMAKE="TRUE" ;;
*)TEST_WITH_CMAKE="FALSE" ;; *)TEST_WITH_CMAKE="FALSE" ;;
esac esac
else else
TEST_WITH_CMAKE="FALSE" TEST_WITH_CMAKE="FALSE"
fi fi
echo "Run all tests." echo "Run all tests."
if [ "${TEST_WITH_CMAKE}" != "FALSE" ]; then if [ "${TEST_WITH_CMAKE}" != "FALSE" ]; then
configure configure
fi fi
@ -140,11 +136,11 @@ run()
# The clean target generated by CMake under cygwin # The clean target generated by CMake under cygwin
# always fails for some reason # always fails for some reason
# #
if ! ( uname | grep -q "CYGWIN" ) ; then if ! ( uname | grep -q "CYGWIN" ) ; then
make -fMakefile clean make -fMakefile clean
fi fi
else else
eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null " eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null "
fi fi
#EOF #EOF