From 3a3de0cb6db524967034a48d04a5df86d9eeaf59 Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Thu, 15 Feb 2007 23:58:10 +0000 Subject: [PATCH] Remove default-generated cgal_test and makefile Rename .C to .cpp --- .gitattributes | 1 - Min_sphere_d/test/Min_sphere_d/cgal_test | 77 ------------------- Min_sphere_d/test/Min_sphere_d/makefile | 61 --------------- ...{min_sphere_test.C => min_sphere_test.cpp} | 0 ..._2_test.C => min_sphere_traits_2_test.cpp} | 0 ..._3_test.C => min_sphere_traits_3_test.cpp} | 0 6 files changed, 139 deletions(-) delete mode 100755 Min_sphere_d/test/Min_sphere_d/cgal_test delete mode 100644 Min_sphere_d/test/Min_sphere_d/makefile rename Min_sphere_d/test/Min_sphere_d/{min_sphere_test.C => min_sphere_test.cpp} (100%) rename Min_sphere_d/test/Min_sphere_d/{min_sphere_traits_2_test.C => min_sphere_traits_2_test.cpp} (100%) rename Min_sphere_d/test/Min_sphere_d/{min_sphere_traits_3_test.C => min_sphere_traits_3_test.cpp} (100%) diff --git a/.gitattributes b/.gitattributes index d59cc7628b8..428505ba3d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1301,7 +1301,6 @@ Min_ellipse_2/test/Min_ellipse_2/test_Min_ellipse_2.cmd eol=lf Min_quadrilateral_2/demo/Min_quadrilateral_2/help/index.html svneol=native#text/html Min_quadrilateral_2/demo/Min_quadrilateral_2/min_quadrilateral_2.vcproj eol=crlf Min_quadrilateral_2/test/Min_quadrilateral_2/cgal_test eol=lf -Min_sphere_d/test/Min_sphere_d/cgal_test eol=lf Min_sphere_d_new/test/Min_sphere_d_new/test_Min_sphere_d_2.cmd eol=lf Min_sphere_d_new/test/Min_sphere_d_new/test_Min_sphere_d_3.cmd eol=lf Min_sphere_d_new/test/Min_sphere_d_new/test_Min_sphere_d_d.cmd eol=lf diff --git a/Min_sphere_d/test/Min_sphere_d/cgal_test b/Min_sphere_d/test/Min_sphere_d/cgal_test deleted file mode 100755 index 1affe0cae6c..00000000000 --- a/Min_sphere_d/test/Min_sphere_d/cgal_test +++ /dev/null @@ -1,77 +0,0 @@ -#! /bin/sh - -# This is a script for the CGAL test suite. Such a script must obey -# the following rules: -# -# - the name of the script is cgal_test -# - for every target two one line messages are written to the file 'error.txt' -# the first one indicates if the compilation was successful -# the second one indicates if the execution was successful -# if one of the two was not successful, the line should start with 'ERROR:' -# - running the script should not require any user interaction -# - the script should clean up object files and executables - -ERRORFILE=error.txt - -#---------------------------------------------------------------------# -# compile_and_run -#---------------------------------------------------------------------# - -compile_and_run() -{ - echo "Compiling $1 ... " - SUCCES="y" - if eval 'make CGAL_MAKEFILE=$CGAL_MAKEFILE \ - TESTSUITE_CXXFLAGS="$TESTSUITE_CXXFLAGS" \ - TESTSUITE_LDFLAGS="$TESTSUITE_LDFLAGS" $1' ; then - echo " succesful compilation of $1" >> $ERRORFILE - else - echo " ERROR: compilation of $1" >> $ERRORFILE - SUCCES="" - fi - - if [ -n "${SUCCES}" ] ; then - OUTPUTFILE=ProgramOutput.$1.$PLATFORM - rm -f $OUTPUTFILE - COMMAND="./$1" - if [ -f $1.cmd ] ; then - COMMAND="$COMMAND `cat $1.cmd`" - fi - if [ -f $1.cin ] ; then - COMMAND="cat $1.cin | $COMMAND" - fi - echo "Executing $1 ... " - echo - if eval 2>&1 $COMMAND > $OUTPUTFILE ; then - echo " succesful execution of $1" >> $ERRORFILE - else - echo " ERROR: execution of $1" >> $ERRORFILE - fi - else - echo " ERROR: not executed $1" >> $ERRORFILE - fi - - eval "2>&1 make CGAL_MAKEFILE=$CGAL_MAKEFILE clean > /dev/null " -} - -#---------------------------------------------------------------------# -# remove the previous error file -#---------------------------------------------------------------------# - -rm -f $ERRORFILE -touch $ERRORFILE - -#---------------------------------------------------------------------# -# compile and run the tests -#---------------------------------------------------------------------# - -if [ $# -ne 0 ] ; then - for file in $* ; do - compile_and_run $file - done -else - compile_and_run min_sphere_test - compile_and_run min_sphere_traits_2_test - compile_and_run min_sphere_traits_3_test -fi - diff --git a/Min_sphere_d/test/Min_sphere_d/makefile b/Min_sphere_d/test/Min_sphere_d/makefile deleted file mode 100644 index 412b4362d82..00000000000 --- a/Min_sphere_d/test/Min_sphere_d/makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Created by the script create_makefile -# This is the makefile for compiling a CGAL application. - -#---------------------------------------------------------------------# -# include platform specific settings -#---------------------------------------------------------------------# -# Choose the right include file from the /make directory. -CGAL_MAKEFILE = /home/gaertner/cgal/CGAL-3.2/make/makefile_i686_Linux-2.6_g++-3.4.5 -# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE -include $(CGAL_MAKEFILE) - -#---------------------------------------------------------------------# -# compiler flags -#---------------------------------------------------------------------# - -CXXFLAGS = \ - -I../../include \ - $(CGAL_CXXFLAGS) \ - $(LONG_NAME_PROBLEM_CXXFLAGS) - -#---------------------------------------------------------------------# -# linker flags -#---------------------------------------------------------------------# - -LIBPATH = \ - $(CGAL_LIBPATH) - -LDFLAGS = \ - $(LONG_NAME_PROBLEM_LDFLAGS) \ - $(CGAL_LDFLAGS) - -#---------------------------------------------------------------------# -# target entries -#---------------------------------------------------------------------# - -all: \ - min_sphere_test$(EXE_EXT) \ - min_sphere_traits_2_test$(EXE_EXT) \ - min_sphere_traits_3_test$(EXE_EXT) - -min_sphere_test$(EXE_EXT): min_sphere_test$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)min_sphere_test min_sphere_test$(OBJ_EXT) $(LDFLAGS) - -min_sphere_traits_2_test$(EXE_EXT): min_sphere_traits_2_test$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)min_sphere_traits_2_test min_sphere_traits_2_test$(OBJ_EXT) $(LDFLAGS) - -min_sphere_traits_3_test$(EXE_EXT): min_sphere_traits_3_test$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)min_sphere_traits_3_test min_sphere_traits_3_test$(OBJ_EXT) $(LDFLAGS) - -clean: \ - min_sphere_test.clean \ - min_sphere_traits_2_test.clean \ - min_sphere_traits_3_test.clean - -#---------------------------------------------------------------------# -# suffix rules -#---------------------------------------------------------------------# - -.C$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $< - diff --git a/Min_sphere_d/test/Min_sphere_d/min_sphere_test.C b/Min_sphere_d/test/Min_sphere_d/min_sphere_test.cpp similarity index 100% rename from Min_sphere_d/test/Min_sphere_d/min_sphere_test.C rename to Min_sphere_d/test/Min_sphere_d/min_sphere_test.cpp diff --git a/Min_sphere_d/test/Min_sphere_d/min_sphere_traits_2_test.C b/Min_sphere_d/test/Min_sphere_d/min_sphere_traits_2_test.cpp similarity index 100% rename from Min_sphere_d/test/Min_sphere_d/min_sphere_traits_2_test.C rename to Min_sphere_d/test/Min_sphere_d/min_sphere_traits_2_test.cpp diff --git a/Min_sphere_d/test/Min_sphere_d/min_sphere_traits_3_test.C b/Min_sphere_d/test/Min_sphere_d/min_sphere_traits_3_test.cpp similarity index 100% rename from Min_sphere_d/test/Min_sphere_d/min_sphere_traits_3_test.C rename to Min_sphere_d/test/Min_sphere_d/min_sphere_traits_3_test.cpp