From 289754c46ce29287670745d272fc89c70526412a Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sat, 9 May 2009 16:35:14 +0000 Subject: [PATCH] Remove pre-CMake scripts. --- .gitattributes | 1 - Testsuite/test/collect_cgal_testresults | 189 ----------------------- Testsuite/test/makefile | 197 ------------------------ Testsuite/test/run_testsuite | 193 ----------------------- 4 files changed, 580 deletions(-) delete mode 100755 Testsuite/test/collect_cgal_testresults delete mode 100644 Testsuite/test/makefile delete mode 100755 Testsuite/test/run_testsuite diff --git a/.gitattributes b/.gitattributes index d5615dd65d9..81256e6d4ad 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3940,7 +3940,6 @@ Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/quick_test_ Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/quick_test_suite.sh eol=lf Testsuite/test/collect_cgal_testresults_from_cmake -text Testsuite/test/makefile2 -text -Testsuite/test/run_testsuite eol=lf Testsuite/test/run_testsuite_with_cmake -text Triangulation_2/demo/Triangulation_2/qt3/help/cindex.html svneol=native#text/html Triangulation_2/demo/Triangulation_2/qt3/help/cinput_point_layer.gif -text svneol=unset#image/gif diff --git a/Testsuite/test/collect_cgal_testresults b/Testsuite/test/collect_cgal_testresults deleted file mode 100755 index 72ed5fec5d2..00000000000 --- a/Testsuite/test/collect_cgal_testresults +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/sh -# collect_cgal_testresults -# ======================== -# collect all files to generate the html page -# containing the testsuite results -# -# to be run in the CGAL/test directory or a local test directory. -# $CGAL_MAKEFILE is used to find out $CGAL_DIR. -# CGAL_TESTER, CGAL_TESTER_NAME, CGAL_TESTER_ADDRESS are also used as -# environment variables. - -# attempt to find a POSIX grep, even on Solaris. -OLD_PATH=$PATH -GREP=grep -GETCONF=`which getconf` -OLD_GREP=`which grep` -if [ -n "$GETCONF" ]; then - GETCONF_PATH=`getconf PATH` - if [ -n "$GETCONF_PATH" ]; then - PATH=$GETCONF_PATH - NEW_GREP=`which grep` - if [ -n "$NEW_GREP" -a "x$NEW_GREP" != "x$OLD_GREP" ]; then - printf 'Use %s as POSIX grep.\n' "$NEW_GREP" - GREP=$NEW_GREP - fi - fi -fi -PATH=$OLD_PATH - -print_platforms() -{ - cd Number_types # Pick a stable directory at random - for FILE in `ls CompilerOutput_*` ; do - PLATFORM=`echo $FILE | sed 's/CompilerOutput_//'| sed 's/\.gz//'` - printf "$PLATFORM " - done - cd .. -} - -#print_testresult -print_testresult() -{ - if [ ! -f "ErrorOutput_$1" ] ; then - RESULT="?" - else - if $GREP ERROR "ErrorOutput_$1" > /dev/null ; then - RESULT="n" - else - # grep -q means "quiet": no output, the return code is 0 iff the file - # matches the regular expression. - # (LR, 2008/08/22: it seems grep on Solaris still does not understand "-q"!) - # grep -i means "case insensitive". - # grep -E means "extended regular expressions". - # All those three options are in the Single Unix Specification version 3 - # The extended regular expression '[^a-zA-Z_,]warning' matches any - # string "warning" preceded with a letter that is not a letter or '_' or ',' - # That avoids some false positives such as - # '-read_only_relocs,warning' or '-D_CRT_SECURE_NO_WARNINGS' - if $GREP -i -E '(^|[^a-zA-Z_,])warning' "CompilerOutput_$1" ProgramOutput.*.$1 > /dev/null ; then - RESULT="w" - else - RESULT="y" - fi - fi - fi - echo "$2 $RESULT" -} - -# do_platform -do_platform() -{ - PLATFORM=$1 - CURRENT_DIR=`pwd` - TESTER=${CGAL_TESTER:-${USER:-`whoami`}} - TESTER_NAME="${CGAL_TESTER_NAME:-${TESTER}}" - TESTER_ADDRESS="${CGAL_TESTER_ADDRESS:-${TESTER}}" - TEST_REPORT="TestReport_${TESTER}_${PLATFORM}" - RESULT_FILE=$CURRENT_DIR/results_${TESTER}_${PLATFORM}.txt - CGAL_DIR=.. - if [ "${CGAL_MAKEFILE}" ]; then - CGAL_DIR=`dirname $CGAL_MAKEFILE`/.. - fi - rm -f "$RESULT_FILE" - touch "$RESULT_FILE" - sed -n '/CGAL_VERSION /s/#define //p' < "$CGAL_DIR/include/CGAL/version.h" >> "$RESULT_FILE" - echo "TESTER ${TESTER}" >> "$RESULT_FILE" - echo "TESTER_NAME ${TESTER_NAME}" >> "$RESULT_FILE" - echo "TESTER_ADDRESS ${TESTER_ADDRESS}" >> "$RESULT_FILE" - echo "GREP ${GREP}" >> "$RESULT_FILE" - echo "PLATFORM ${PLATFORM}" >> "$RESULT_FILE" - - LEDA_INCL_DIR=`cat "${CGAL_DIR}/config/install/${PLATFORM}" |sed -n '/LEDA_INCL_DIR/s/^.*= .\([^ ]*\). .*$/\1/p'` - if [ -r "${LEDA_INCL_DIR}/LEDA/basic.h" ]; then - sed -n '/__LEDA__/s/^#define __LEDA__/LEDA version/p' < "${LEDA_INCL_DIR}/LEDA/basic.h" >>"$RESULT_FILE" - fi - - cat "${CGAL_DIR}/config/install/${PLATFORM}" >> "$RESULT_FILE" - echo "------------" >> "$RESULT_FILE" - - if [ -f "install.log.${PLATFORM}" ] ; then - [ -f install.log ] && cat install.log >> "Installation/ProgramOutput.install.log.${PLATFORM}" - cat "install.log.${PLATFORM}" >> "Installation/ProgramOutput.install.log.${PLATFORM}" - - grep "Compilation of" "install.log.${PLATFORM}" \ - | awk '{ print $3 " " $4 " " $6; }' \ - | sed -e 's/succeeded\.$/y/' -e 's/failed\.$/n/' \ - | while read libname shared_or_static y_or_no; do - mkdir "${libname}_${shared_or_static}" - - # Make sure to let the following variable _buildlog_marker be synced - # with the variable _buildlog_marker from the script install_cgal. - _buildlog_marker="log for ${libname} ${shared_or_static} shown" - - cat "install.log.${PLATFORM}" \ - | sed -n "/${_buildlog_marker} below/,/${_buildlog_marker} above/ p" \ - > "${libname}_${shared_or_static}/$TEST_REPORT" - - # Test if there is a warning in the build log. - if [ "$y_or_no" = "y" ]; then - # See the comment line 31. - if $GREP -i -E '[^a-zA-Z_,]warning' "${libname}_${shared_or_static}/$TEST_REPORT" > /dev/null ; then - y_or_no=w - fi - fi - - echo ${libname}_${shared_or_static} $y_or_no >> "$RESULT_FILE" - done - fi - - for DIR in $TEST_DIRECTORIES ; do - if [ -d $DIR ] ; then - echo " $DIR ..." - cd $DIR - - print_testresult $PLATFORM $DIR >> "$RESULT_FILE" - - rm -f "${TEST_REPORT}" - touch "$TEST_REPORT" - - if [ ! -f "ErrorOutput_${PLATFORM}" ] ; then - echo "Error: file $DIR/ErrorOutput_${PLATFORM} does not exist!" - else - cat "ErrorOutput_${PLATFORM}" >> "$TEST_REPORT" - fi - - if [ ! -f CompilerOutput_${PLATFORM} ] ; then - echo "Error: file $DIR/CompilerOutput_${PLATFORM} does not exist!" - else - cat CompilerOutput_${PLATFORM} >> "$TEST_REPORT" - fi - - if 2>&1 eval ls ProgramOutput.*.${PLATFORM} > /dev/null ; then - PROGRAM_OUTPUT=`ls ProgramOutput.*$PLATFORM*` - for FILE in $PROGRAM_OUTPUT ; do - echo >> "$TEST_REPORT" - echo "------------------------------------------------------------------" >> "$TEST_REPORT" - echo "- $FILE" >> "$TEST_REPORT" - echo "------------------------------------------------------------------" >> "$TEST_REPORT" - cat "$FILE" >> "$TEST_REPORT" - done - fi - - cd .. - fi - done - - OUTPUT_FILE=results_${TESTER}_${PLATFORM}.tar - rm -f "$OUTPUT_FILE" "$OUTPUT_FILE.gz" - tar cf "$OUTPUT_FILE" results_${TESTER}_${PLATFORM}.txt */"$TEST_REPORT" - echo - echo "compressing ..." - gzip -9f "$OUTPUT_FILE" - echo "results written to file $OUTPUT_FILE.gz" - echo -} - -if [ -z "$1" ] ; then - TEST_DIRECTORIES=`ls` -else - TEST_DIRECTORIES="$*" -fi - -for PLATFORM in `print_platforms` ; do - echo "---------------------------------------------------------------" - echo " Collecting results of platform $PLATFORM" - echo "---------------------------------------------------------------" - do_platform $PLATFORM -done - diff --git a/Testsuite/test/makefile b/Testsuite/test/makefile deleted file mode 100644 index 2eaed71359a..00000000000 --- a/Testsuite/test/makefile +++ /dev/null @@ -1,197 +0,0 @@ -# A makefile which calls run_testsuite over all directories. -# -# Author : Sylvain Pion - -# The "all" target is split in several parts (based on the first -# character of each directory) to allow parallelization using "make -j". - -all: all_sS all_nN all_aA all_bB all_cC all_dD all_eE all_fF all_gG all_hH all_iI all_jJ all_kK all_lL all_mM all_oO all_pP all_qQ all_rR all_tT all_uU all_vV all_wW all_xX all_yY all_zZ - -all_aA: - @+for DIR in [0-9_aA]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_bB: - @+for DIR in [bB]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_cC: - @+for DIR in [cC]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_dD: - @+for DIR in [dD]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_eE: - @+for DIR in [eE]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_fF: - @+for DIR in [fF]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_gG: - @+for DIR in [gG]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_hH: - @+for DIR in [hH]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_iI: - @+for DIR in [iI]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_jJ: - @+for DIR in [jJ]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_kK: - @+for DIR in [kK]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_lL: - @+for DIR in [lL]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_mM: - @+for DIR in [mM]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_nN: - @+for DIR in [nN]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_oO: - @+for DIR in [oO]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_pP: - @+for DIR in [pP]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_qQ: - @+for DIR in [qQ]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_rR: - @+for DIR in [rR]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_sS: - @+for DIR in [sS]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_tT: - @+for DIR in [tT]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_uU: - @+for DIR in [uU]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_vV: - @+for DIR in [vV]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_wW: - @+for DIR in [wW]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_xX: - @+for DIR in [xX]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_yY: - @+for DIR in [yY]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -all_zZ: - @+for DIR in [zZ]*; do \ - if test -d "$$DIR"; then \ - ( ./run_testsuite "$$DIR" ) \ - fi; \ - done - -clean: - @for DIR in *; do \ - if test -d "$$DIR"; then \ - ( cd "$$DIR" && $(MAKE) clean ) \ - fi; \ - done diff --git a/Testsuite/test/run_testsuite b/Testsuite/test/run_testsuite deleted file mode 100755 index d50da4215be..00000000000 --- a/Testsuite/test/run_testsuite +++ /dev/null @@ -1,193 +0,0 @@ -#! /bin/sh -# -# This is the test script for the CGAL-library. -# -# Usage: -# run_testsuite for running the test suite in all subdirectories -# run_testsuite for running the test suite in the listed -# subdirectories -# -# To use this script you have to do two things: -# -# 1) enter the makefiles of the platforms that you want to test with (below) -# 2) set some additional compiler and or linker flags - -TESTSUITE_CXXFLAGS="" -TESTSUITE_LDFLAGS="" - -CURRENTDIR=`pwd` -ERRORFILE=${CURRENTDIR}/error.txt - -#clear the error file -rm -f $ERRORFILE -touch $ERRORFILE - -# Wait for process with pid $1. -# Wait for $2 periods of $3 seconds, checking after every period -# if the watched process has finished. -wait_for_process() -{ - pid=$1; - cycles=$2 - period=$3 - while [ $cycles -ne 0 ] - do - cycles=`expr $cycles - 1` -# send SIGCONT to the process and check the exit value of kill. -# If the process still exists, the call to kill succeeds (and the signal is -# ignored). - - kill -CONT $pid 2>kill_output 1>/dev/null; terminated=$? -# But under CYGWIN the exit status is not to be trusted. - if [ $terminated -eq 0 ]; then - if grep -i 'no such process' kill_output; then - terminated=1; - fi - fi - rm -f kill_output - if [ $terminated -eq 0 ] - then - sleep $period - else - cycles=0 - running=0 - fi - done - if [ $terminated -eq 0 ] - then - if false; then -# Send signal Terminate (SIGTERM) to the whole process group. -# First disable the default action (quit) for the current process. - trap true TERM - kill -TERM 0 - trap TERM - else - - # $pid is the PID of the forked shell that launched the command - # in background, in run_local_cgal_test(). If the shell is - # Bash, the Bash manual states that it ignores SIGTERM. - # However, it does not catch SIGHUP. That is why the first - # signal send is SIGHUP. - kill -HUP $pid - sleep 10 - # If SIGHUP was not enough, SIGKILL will finish the job, 10s after. - kill -KILL $pid - fi - return 1 - fi - return 0 -} - -run_local_cgal_test() -{ - eval ./cgal_test >current_compiler_output 2>&1 - exit_value=$? - if [ $exit_value -ne 0 ] - then - printf "%s\n" "$exit_value" > test_failure - fi -} - -#test_directory -test_directory() -{ - cd $CURRENTDIR - if [ -d $1 ] ; then - echo "DIRECTORY $1:" - echo - - echo "DIRECTORY $1:" >> $ERRORFILE - echo >> $ERRORFILE - cd $1 - - COMPILER_OUTPUT=CompilerOutput_$PLATFORM - rm -f $COMPILER_OUTPUT - ERROR_OUTPUT=ErrorOutput_$PLATFORM - rm -f $ERROR_OUTPUT - - echo "------------------------------------------------------------------" >> $COMPILER_OUTPUT - echo "- Compiler output from platform $PLATFORM" >> $COMPILER_OUTPUT - echo "------------------------------------------------------------------" >> $COMPILER_OUTPUT - echo >> $COMPILER_OUTPUT - - echo "------------------------------------------------------------------" >> $ERROR_OUTPUT - echo "- Error output from platform $PLATFORM" >> $ERROR_OUTPUT - echo "------------------------------------------------------------------" >> $ERROR_OUTPUT - echo >> $ERROR_OUTPUT - - if [ -f cgal_test -a -x cgal_test ] ; then - export PLATFORM CGAL_MAKEFILE TESTSUITE_CXXFLAGS TESTSUITE_LDFLAGS - rm -f error.txt - run_local_cgal_test & - - if wait_for_process "$!" "1200" "5" - then - if [ -f test_failure ] ; then - exit_failure=`cat test_failure` - rm -f test_failure - echo "ERROR: cgal_test exited with error condition $exit_value" >> $ERRORFILE - echo "ERROR: cgal_test exited with error condition $exit_value" >> $ERROR_OUTPUT - fi - else - echo "ERROR: cgal_test did not finish within the time bound set" >> $ERRORFILE - echo "ERROR: cgal_test did not finish within the time bound set" >> $ERROR_OUTPUT - fi - cat current_compiler_output >> $COMPILER_OUTPUT - cat current_compiler_output - rm -f current_compiler_output - - if [ -f error.txt ] ; then - cat error.txt >> $ERRORFILE - cat error.txt >> $ERROR_OUTPUT - else - echo "ERROR: the script cgal_test failed to generate output" >> $ERRORFILE - fi - else - echo " Could not execute the script cgal_test in directory $1" - echo "ERROR: could not execute the script $1/cgal_test" >> $ERRORFILE - fi - echo >> $ERRORFILE - echo >> $ERROR_OUTPUT - fi - echo -} - -#run_testsuite -run_testsuite() -{ - CGAL_MAKEFILE=$1 - PLATFORM=`basename $1 | sed -e "s/makefile_//g"` - - echo "---------------------------------------------------------------" - echo "- Testing platform $PLATFORM" - echo "---------------------------------------------------------------" - echo - - echo "---------------------------------------------------------------" >> $ERRORFILE - echo "- TEST RESULTS FROM PLATFORM $PLATFORM" >> $ERRORFILE - echo "---------------------------------------------------------------" >> $ERRORFILE - echo >> $ERRORFILE - - for DIR in $TEST_DIRECTORIES ; do - test_directory $DIR - done -} - -[ x"$1" = x"icons" -o x"$1" = x"resources" ] && exit 0 - -if [ -z "$1" ] ; then - TEST_DIRECTORIES=`ls | egrep -v 'icons|resources'` -else - TEST_DIRECTORIES="$*" -fi - -#-------------------------------------------------------------------$ -# Add a line -# -# run_testsuite -# -# for all platforms that you want to test with. -#-------------------------------------------------------------------$ - -run_testsuite $CGAL_MAKEFILE -