Fixed misspellings

This commit is contained in:
Laurent Saboret 2009-10-02 08:21:41 +00:00
parent 05b7683855
commit ba5baf1fe1
1 changed files with 27 additions and 25 deletions

View File

@ -9,7 +9,7 @@
# coordinator : Utrecht University # coordinator : Utrecht University
# ============================================================================= # =============================================================================
# #
# This script creates a cgal_test_with_cmake script with entries for all .C and .cpp # This script creates a cgal_test_with_cmake script with entries for all .C and .cpp
# files in the current test directory. # files in the current test directory.
VERSION=1.1 VERSION=1.1
@ -62,20 +62,20 @@ cat << EOF
MAKE_CMD=make MAKE_CMD=make
fi fi
NEED_CLEAN= NEED_CLEAN=
EOF EOF
echo
header "configure" header "configure"
echo
cat << EOF cat << EOF
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" \\
.' ; then .' ; then
echo " succesful configuration" >> \$ERRORFILE echo " successful configuration" >> \$ERRORFILE
else else
echo " ERROR: configuration" >> \$ERRORFILE echo " ERROR: configuration" >> \$ERRORFILE
fi fi
@ -83,22 +83,22 @@ configure()
EOF EOF
header "compile_and_run <target>" header "compile_and_run <target>"
echo
cat << EOF cat << EOF
compile_and_run() compile_and_run()
{ {
echo "Compiling \$1 ... " echo "Compiling \$1 ... "
SUCCES="y" SUCCESS="y"
if eval '\${MAKE_CMD} VERBOSE=ON -fMakefile \$1' ; then if eval '\${MAKE_CMD} VERBOSE=ON -fMakefile \$1' ; then
echo " succesful compilation of \$1" >> \$ERRORFILE echo " successful compilation of \$1" >> \$ERRORFILE
else else
echo " ERROR: compilation of \$1" >> \$ERRORFILE echo " ERROR: compilation of \$1" >> \$ERRORFILE
SUCCES="" SUCCESS=""
fi fi
if [ -n "\$DO_RUN" ] ; then if [ -n "\$DO_RUN" ] ; then
if [ -n "\${SUCCES}" ] ; then if [ -n "\${SUCCESS}" ] ; then
OUTPUTFILE=ProgramOutput.\$1.\$PLATFORM OUTPUTFILE=ProgramOutput.\$1.\$PLATFORM
rm -f \$OUTPUTFILE rm -f \$OUTPUTFILE
COMMAND="./\$1" COMMAND="./\$1"
@ -112,7 +112,7 @@ compile_and_run()
echo echo
ulimit -t 3600 2> /dev/null ulimit -t 3600 2> /dev/null
if eval \$COMMAND > \$OUTPUTFILE 2>&1 ; then if eval \$COMMAND > \$OUTPUTFILE 2>&1 ; then
echo " succesful execution of \$1" >> \$ERRORFILE echo " successful execution of \$1" >> \$ERRORFILE
else else
echo " ERROR: execution of \$1" >> \$ERRORFILE echo " ERROR: execution of \$1" >> \$ERRORFILE
fi fi
@ -124,15 +124,17 @@ compile_and_run()
EOF EOF
header "remove the previous error file" header "remove the previous error file"
echo
echo "rm -f \$ERRORFILE"
echo "touch \$ERRORFILE"
echo
header "configure, compile and run the tests"
echo
echo "configure"
echo
cat << EOF cat << EOF
rm -f \$ERRORFILE
touch \$ERRORFILE
EOF
header "configure, compile and run the tests"
cat << EOF
configure
if [ \$# -ne 0 ] ; then if [ \$# -ne 0 ] ; then
for file in \$* ; do for file in \$* ; do
compile_and_run \$file compile_and_run \$file
@ -145,7 +147,7 @@ EOF
tmp=`basename $file .C` tmp=`basename $file .C`
tmp=`basename $tmp .cpp` tmp=`basename $tmp .cpp`
cat <<EOF cat <<EOF
if \${MAKE_CMD} -f Makefile help | grep "$tmp" > /dev/null; then if \${MAKE_CMD} -f Makefile help | grep "$tmp" > /dev/null; then
compile_and_run $tmp compile_and_run $tmp
NEED_CLEAN=y NEED_CLEAN=y
fi fi
@ -156,16 +158,16 @@ cat << EOF
fi fi
# #
# 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 [ -n "\${NEED_CLEAN}" ]; then if [ -n "\${NEED_CLEAN}" ]; then
if ! ( uname | grep -q "CYGWIN" ) ; then if ! ( uname | grep -q "CYGWIN" ) ; then
\${MAKE_CMD} -fMakefile clean \${MAKE_CMD} -fMakefile clean
fi fi
fi fi
EOF EOF
} }
if [ -f cgal_test_with_cmake ] ; then if [ -f cgal_test_with_cmake ] ; then