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

Remove 'tee' redirection

This commit is contained in:
Fernando Cacciola 2008-03-11 17:46:20 +00:00
parent 307eedf236
commit 45b476a299
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Scripts/developer_scripts/autotest_cgal_with_cmake
View File

@ -131,7 +131,7 @@ put_on_web()
{ {
echo "Uploading results ${1} to $UPLOAD_RESULT_DESTINATION/$2" echo "Uploading results ${1} to $UPLOAD_RESULT_DESTINATION/$2"
"$SCP" "${1}" "$UPLOAD_RESULT_DESTINATION"/$2 | tee -a ${ACTUAL_LOGFILE} 2>&1 "$SCP" "${1}" "$UPLOAD_RESULT_DESTINATION"/$2 >> ${ACTUAL_LOGFILE} 2>&1
} }
error() error()
@ -217,7 +217,7 @@ build_cgal_libs()
remote_command ${1} "cd ${CGAL_BINARY_DIR}; \ remote_command ${1} "cd ${CGAL_BINARY_DIR}; \
cmake -DWITH_demo=FALSE -DWITH_examples=FALSE -DWITH_CGALPDB=FALSE ../../..; \ cmake -DWITH_demo=FALSE -DWITH_examples=FALSE -DWITH_CGALPDB=FALSE ../../..; \
make -fMakefile" | tee -a ${ACTUAL_LOGFILE} 2>&1 make -fMakefile" >> ${ACTUAL_LOGFILE} 2>&1
if [ -f "${CGAL_BINARY_DIR}/CMakeFiles/CMakeError.log" ]; then if [ -f "${CGAL_BINARY_DIR}/CMakeFiles/CMakeError.log" ]; then
cp ${CGAL_BINARY_DIR}/CMakeFiles/CMakeError.log ${CGAL_TEST_DIR}/CMakeError_${i}.log cp ${CGAL_BINARY_DIR}/CMakeFiles/CMakeError.log ${CGAL_TEST_DIR}/CMakeError_${i}.log
@ -286,7 +286,7 @@ cd ..;
rm -rf ${CGAL_BINARY_DIR}/test rm -rf ${CGAL_BINARY_DIR}/test
EOF EOF
chmod ugo+x ${CGAL_BINARY_DIR}/localtestscript.${1} chmod ugo+x ${CGAL_BINARY_DIR}/localtestscript.${1}
remote_command ${1} "${CGAL_BINARY_DIR}/localtestscript.${1}" | tee -a ${ACTUAL_LOGFILE}.${1} 2>&1 remote_command ${1} "${CGAL_BINARY_DIR}/localtestscript.${1}" >> ${ACTUAL_LOGFILE}.${1} 2>&1
log_done ${ACTUAL_LOGFILE}.${1} log_done ${ACTUAL_LOGFILE}.${1}
# #
# collect results and put them on the web # collect results and put them on the web

3
Scripts/scripts/cgal_create_cmake_script
View File

@ -29,7 +29,6 @@
# Usage: cgal_create_cmake_script [-options] # Usage: cgal_create_cmake_script [-options]
# #
# -d create a default CGAL cmake script # -d create a default CGAL cmake script
# -t create a CGAL cmake script for the test suite
# -q create a CGAL cmake script with Qt support # -q create a CGAL cmake script with Qt support
@ -136,7 +135,6 @@ usage()
echo "Usage: cgal_create_cmake_script [-options]" echo "Usage: cgal_create_cmake_script [-options]"
echo echo
echo "-d create a default CGAL CMake script" echo "-d create a default CGAL CMake script"
echo "-t create a CGAL CMake script for the test suite"
echo "-q create a CGAL CMake script with Qt support" echo "-q create a CGAL CMake script with Qt support"
} }
@ -150,7 +148,6 @@ esac
for i do for i do
case $i in case $i in
-d) ;; -d) ;;
-t) TESTSUITE='y';;
-q) QT='y';; -q) QT='y';;
-*) usage -*) usage
exit 1;; exit 1;;

2
Testsuite/test/run_testsuite_with_cmake
View File

@ -80,7 +80,7 @@ wait_for_process()
run_local_cgal_test() run_local_cgal_test()
{ {
eval ./cgal_test_with_cmake >current_compiler_output 2>&1 eval ./cgal_test_with_cmake > current_compiler_output 2>&1
exit_value=$? exit_value=$?
if [ $exit_value -ne 0 ] if [ $exit_value -ne 0 ]
then then