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

Whitespace fixes

This commit is contained in:
Laurent Rineau 2020-06-17 12:35:42 +02:00
parent 3468c7bf32
commit 7c8bb622a7
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Testsuite/test/run_testsuite_with_cmake
View File

@ -16,9 +16,9 @@ TESTSUITE_LDFLAGS=""
CURRENTDIR=`pwd` CURRENTDIR=`pwd`
ERRORFILE=${CURRENTDIR}/error.txt ERRORFILE=${CURRENTDIR}/error.txt
if [ -n "$CGAL_TEST_PLATFORM" ]; then if [ -n "$CGAL_TEST_PLATFORM" ]; then
PLATFORM=$CGAL_TEST_PLATFORM PLATFORM=$CGAL_TEST_PLATFORM
else else
PLATFORM=no-platform PLATFORM=no-platform
fi fi
if [ -n "${CGAL_TIMEOUT_PROG+x}" ]; then if [ -n "${CGAL_TIMEOUT_PROG+x}" ]; then
@ -39,9 +39,9 @@ process_tree()
local pid=$1 local pid=$1
local result= local result=
echo $pid echo $pid
ps -a | awk '!/^ +PID/ {print $1 " " $2}' | { ps -a | awk '!/^ +PID/ {print $1 " " $2}' | {
while read apid appid; do while read apid appid; do
if [ "$appid" = "$pid" ]; then if [ "$appid" = "$pid" ]; then
process_tree $apid process_tree $apid
fi fi
done done
@ -58,11 +58,11 @@ wait_for_process()
period=$3 period=$3
while [ $cycles -ne 0 ] while [ $cycles -ne 0 ]
do do
cycles=`expr $cycles - 1` cycles=`expr $cycles - 1`
# send SIGCONT to the process and check the exit value of kill. # 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 # If the process still exists, the call to kill succeeds (and the signal is
# ignored). # ignored).
kill -CONT $pid 2>kill_output 1>/dev/null; terminated=$? kill -CONT $pid 2>kill_output 1>/dev/null; terminated=$?
# But under CYGWIN the exit status is not to be trusted. # But under CYGWIN the exit status is not to be trusted.
if [ $terminated -eq 0 ]; then if [ $terminated -eq 0 ]; then
@ -94,7 +94,7 @@ wait_for_process()
# Bash, the Bash manual states that it ignores SIGTERM. # Bash, the Bash manual states that it ignores SIGTERM.
# However, it does not catch SIGHUP. That is why the first # However, it does not catch SIGHUP. That is why the first
# signal send is SIGHUP. # signal send is SIGHUP.
case "`uname`" in case "`uname`" in
CYGWIN*) CYGWIN*)
pids=`process_tree $pid`;; pids=`process_tree $pid`;;
*) pids=$pid;; *) pids=$pid;;
@ -104,7 +104,7 @@ wait_for_process()
# If SIGHUP was not enough, SIGKILL will finish the job, 10s after. # If SIGHUP was not enough, SIGKILL will finish the job, 10s after.
for p in $pids; do kill -KILL $p 2>/dev/null; done for p in $pids; do kill -KILL $p 2>/dev/null; done
fi fi
return 1 return 1
fi fi
return 0 return 0
} }
@ -136,8 +136,8 @@ test_directory()
{ {
cd "$CURRENTDIR" cd "$CURRENTDIR"
if [ -d $1 ] ; then if [ -d $1 ] ; then
echo "DIRECTORY $1:" echo "DIRECTORY $1:"
echo echo
echo "DIRECTORY $1:" >> "$ERRORFILE" echo "DIRECTORY $1:" >> "$ERRORFILE"
echo >> "$ERRORFILE" echo >> "$ERRORFILE"
@ -202,7 +202,7 @@ test_directory()
printf " # Running time: %s (seconds)\n\n" "$DURATION" >> "$ERROR_OUTPUT" printf " # Running time: %s (seconds)\n\n" "$DURATION" >> "$ERROR_OUTPUT"
cat current_compiler_output >> "$COMPILER_OUTPUT" cat current_compiler_output >> "$COMPILER_OUTPUT"
cat current_compiler_output cat current_compiler_output
rm -f current_compiler_output rm -f current_compiler_output
if [ -f error.txt ] ; then if [ -f error.txt ] ; then
cat error.txt >> "$ERRORFILE" cat error.txt >> "$ERRORFILE"
@ -227,18 +227,18 @@ test_directory()
run_testsuite() run_testsuite()
{ {
echo "---------------------------------------------------------------" echo "---------------------------------------------------------------"
echo "- Testing platform $PLATFORM" echo "- Testing platform $PLATFORM"
echo "---------------------------------------------------------------" echo "---------------------------------------------------------------"
echo echo
echo "---------------------------------------------------------------" >> "$ERRORFILE" echo "---------------------------------------------------------------" >> "$ERRORFILE"
echo "- TEST RESULTS FROM PLATFORM $PLATFORM" >> "$ERRORFILE" echo "- TEST RESULTS FROM PLATFORM $PLATFORM" >> "$ERRORFILE"
echo "---------------------------------------------------------------" >> "$ERRORFILE" echo "---------------------------------------------------------------" >> "$ERRORFILE"
echo >> "$ERRORFILE" echo >> "$ERRORFILE"
case "`uname`" in case "`uname`" in
CYGWIN*) CYGWIN*)
PATH=`cygpath "$CGAL_DIR"`/bin:`cygpath "$CGAL_DIR"`/lib:$PATH PATH=`cygpath "$CGAL_DIR"`/bin:`cygpath "$CGAL_DIR"`/lib:$PATH
export PATH export PATH
@ -258,4 +258,3 @@ else
fi fi
run_testsuite run_testsuite