From 7b23a8f8f18a4788caa163e8be720fe0ca7d4c4e Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Mon, 15 Feb 2021 14:42:13 +0100
Subject: [PATCH] WIP

---
 Scripts/developer_scripts/autotest_cgal       | 39 +++++++++++++++----
 .../cgal_demo_copy_all_dlls_cygwin.sh         | 12 ++++--
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal
index 70830eb86c9..3965f3df616 100755
--- a/Scripts/developer_scripts/autotest_cgal
+++ b/Scripts/developer_scripts/autotest_cgal
@@ -624,9 +624,9 @@ if [ -f '${LIST_TEST_PACKAGES}' ]; then
 
   mkdir '${CGAL_BINARY_DIR}/test'
 
-  cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test'
-  cp '${CGAL_TEST_DIR}/makefile2'                           '${CGAL_BINARY_DIR}/test'
-  cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake'            '${CGAL_BINARY_DIR}/test'
+  cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake'  '${CGAL_BINARY_DIR}/test'
+  cp '${CGAL_TEST_DIR}/makefile2'                            '${CGAL_BINARY_DIR}/test'
+  cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake'             '${CGAL_BINARY_DIR}/test'
 
   for PACKAGE in \`source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}'\`; do
 
@@ -649,14 +649,39 @@ else
 fi
 nice ${NICE_OPTIONS} make ${MAKE_OPTS} -k -fmakefile2;
 EOF
-    for file in "${CGAL_BINARY_DIR}/localtestscript" "${CGAL_BINARY_DIR}/localtestscript-redo-results-collection"; do
-      cat >> "$file" <<EOF
+for file in "${CGAL_BINARY_DIR}/localtestscript" "${CGAL_BINARY_DIR}/localtestscript-redo-results-collection"; do
+     cat >> "$file" <<EOF
 echo 'COLLECTING RESULTS';
 ./collect_cgal_testresults_from_cmake;
 if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
-  echo 'COLLECTING DEMOS BINARIES';
-  tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
+ echo 'COLLECTING DEMOS BINARIES';
+ echo "cp ${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
+ cp "${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
+EOF
+ cat >> "$file" <<'EOF'
+ for demo_dir in *_Demo; do
+   echo "pushd ${demo_dir}"
+   pushd "${demo_dir}"
+   bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls"
+   mv "${demo_dir}_with_dlls" ..
+   popd
+ done
+EOF
+cat >> "$file" <<EOF
+ tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
 fi
+echo 'COPYING RESULTS';
+cp "results_${CGAL_TESTER}_${PLATFORM}.tar.gz" "results_${CGAL_TESTER}_${PLATFORM}.txt" "${CGAL_TEST_DIR}";
+cd ..;
+EOF
+   done
+   if [ -z "${KEEP_TESTS}" ]; then
+     cat >> "${CGAL_BINARY_DIR}/localtestscript" <<EOF
+echo 'REMOVING LOCAL_TEST_DIR';
+rm -rf '${CGAL_BINARY_DIR}/test'
+EOF
+fi
+
 echo 'COPYING RESULTS';
 cp 'results_${CGAL_TESTER}_${PLATFORM}.tar.gz' 'results_${CGAL_TESTER}_${PLATFORM}.txt' '${CGAL_TEST_DIR}';
 cd ..;
diff --git a/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh b/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
index 61de43c3945..3a6192f92ac 100644
--- a/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
+++ b/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
@@ -3,9 +3,13 @@
 #use this script from inside the build directory of the Polyhedron demo
 #Needs the Qt5_DIR env variable set to <Qt5_ROOT>/lib/cmake/Qt5
 
-declare config="Release"
+#No config : in autotest_cgal we use NMake as generator
+#If you are using Visual as Generator, declare config="Release"
+
+
+declare config="$PWD"
+declare target_directory="$1"
 
-declare target_directory="CGAL_demo_with_dlls"
 if [[ ! -d "$target_directory" ]]
 then
   mkdir $target_directory
@@ -34,6 +38,6 @@ for file in "${files[@]}"; do
     copy_dll "$dll" "$target_directory"
 
   done; #check dependencies
+  mkdir -p "$target_directory/platforms"
+  cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"
 done #loop over directories
-mkdir -p "$target_directory/platforms"
-cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"