From 72052b11b456d467deaa0be5e62721632849edf7 Mon Sep 17 00:00:00 2001
From: Nicolas Saillant <saillantnicolas01@gmail.com>
Date: Thu, 9 Mar 2023 12:01:02 +0100
Subject: [PATCH 01/16] Collect Demos in run_testsuite_with_ctest

---
 .../run_testsuite_with_ctest                  | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 69d5adf8d0e..e72f75a54c0 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -304,6 +304,86 @@ run_test_on_platform()
   else
     ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}|tee tmp.txt
   fi
+
+  if [ -f "${CGAL_BINARY_DIR}/localtestscript" ]; then
+    log "${ACTUAL_LOGFILE}" "WARNING! Already tested on platform ${PLATFORM}."
+  else
+    if [ -f "${CGAL_BINARY_DIR}/setup" ]; then
+      cp "${CGAL_BINARY_DIR}/setup" "${CGAL_BINARY_DIR}/localtestscript"
+    else
+      rm -f "${CGAL_BINARY_DIR}/localtestscript"
+    fi
+
+    cat >> "${CGAL_BINARY_DIR}/localtestscript" <<EOF
+    LIST_TEST_PACKAGES='${LIST_TEST_PACKAGES}'
+    CGAL_ROOT='${CGAL_ROOT}'
+
+    rm -rf '${CGAL_BINARY_DIR}/test';
+    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'
+
+    # list all packages in CGAL_TEST_DIR. If PACKAGE is found in LIST_TEST_PACKAGES,
+    # copy it, else prepare for the special "skipped" case in the table.
+    for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do
+      if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then
+        if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | grep -E -q \$PACKAGE; then
+          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
+          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
+        elif [ "\$PACKAGE" = "resources" ]; then
+          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
+          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
+        else
+          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
+          touch "${CGAL_BINARY_DIR}/test/\${PACKAGE}/skipped"
+        fi
+      fi
+
+  done
+
+else
+  cp -r '${CGAL_TEST_DIR}' '${CGAL_BINARY_DIR}/test';
+fi
+
+cd '${CGAL_BINARY_DIR}/test';
+if [ -n "\${ULIMIT_OPTIONS}" ]; then
+  eval ulimit \${ULIMIT_OPTIONS};
+else
+  [ -n "${ULIMIT_OPTIONS}" ] && ulimit ${ULIMIT_OPTIONS};
+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
+      echo 'COLLECTING RESULTS';
+      ./collect_cgal_testresults_from_cmake;
+      if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
+        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
+
+
   #####################
   ##   GET RESULTS   ##
   #####################

From 53baaf70fd6930175fa78f7ecfb9ec2ec1cd554f Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Fri, 10 Mar 2023 14:30:25 +0100
Subject: [PATCH 02/16] move collect_demo_binaries to separate function

---
 .../run_testsuite_with_ctest                  | 103 ++++--------------
 1 file changed, 24 insertions(+), 79 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index e72f75a54c0..6bcabeee20a 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -205,6 +205,27 @@ put_on_web()
 
 
 
+collect_demo_binaries()
+{
+  PLATFORM=${1}
+
+  if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
+    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"
+
+    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
+
+    tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
+  fi
+}
+
 publish_results()
 {
   PLATFORM=${1}
@@ -305,85 +326,6 @@ run_test_on_platform()
     ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}|tee tmp.txt
   fi
 
-  if [ -f "${CGAL_BINARY_DIR}/localtestscript" ]; then
-    log "${ACTUAL_LOGFILE}" "WARNING! Already tested on platform ${PLATFORM}."
-  else
-    if [ -f "${CGAL_BINARY_DIR}/setup" ]; then
-      cp "${CGAL_BINARY_DIR}/setup" "${CGAL_BINARY_DIR}/localtestscript"
-    else
-      rm -f "${CGAL_BINARY_DIR}/localtestscript"
-    fi
-
-    cat >> "${CGAL_BINARY_DIR}/localtestscript" <<EOF
-    LIST_TEST_PACKAGES='${LIST_TEST_PACKAGES}'
-    CGAL_ROOT='${CGAL_ROOT}'
-
-    rm -rf '${CGAL_BINARY_DIR}/test';
-    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'
-
-    # list all packages in CGAL_TEST_DIR. If PACKAGE is found in LIST_TEST_PACKAGES,
-    # copy it, else prepare for the special "skipped" case in the table.
-    for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do
-      if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then
-        if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | grep -E -q \$PACKAGE; then
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
-        elif [ "\$PACKAGE" = "resources" ]; then
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
-        else
-          mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
-          touch "${CGAL_BINARY_DIR}/test/\${PACKAGE}/skipped"
-        fi
-      fi
-
-  done
-
-else
-  cp -r '${CGAL_TEST_DIR}' '${CGAL_BINARY_DIR}/test';
-fi
-
-cd '${CGAL_BINARY_DIR}/test';
-if [ -n "\${ULIMIT_OPTIONS}" ]; then
-  eval ulimit \${ULIMIT_OPTIONS};
-else
-  [ -n "${ULIMIT_OPTIONS}" ] && ulimit ${ULIMIT_OPTIONS};
-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
-      echo 'COLLECTING RESULTS';
-      ./collect_cgal_testresults_from_cmake;
-      if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
-        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
-
-
   #####################
   ##   GET RESULTS   ##
   #####################
@@ -450,6 +392,9 @@ run_test_on_host()
   for PLATFORM in ${PLATFORMS}; do
     run_test_on_platform "${PLATFORM}"
     publish_results "${PLATFORM}"
+    if [ -n "${COLLECT_DEMO_BINARIES}" ]; then
+      collect_demo_binaries "${PLATFORM}"
+    fi
     if [ -z "${KEEP_TESTS}" ]; then
       rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}
     fi

From 8c2b0b40650f68b925564283b6a297c9bf4c477c Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Mon, 24 Apr 2023 19:08:32 +0200
Subject: [PATCH 03/16] cgal_demo_copy_all_dlls_cygwin takes two arguments:

target_directory config_type
---
 Scripts/developer_scripts/run_testsuite_with_ctest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 6bcabeee20a..94ea9f991c3 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -217,7 +217,7 @@ collect_demo_binaries()
     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" ""
+      bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
       mv "${demo_dir}_with_dlls" ..
       popd
     done

From d38078245b5fb136195778408b7a4ebd01454287 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Mon, 22 May 2023 13:18:11 +0200
Subject: [PATCH 04/16] fix typo

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 94ea9f991c3..9e91e686143 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -392,7 +392,7 @@ run_test_on_host()
   for PLATFORM in ${PLATFORMS}; do
     run_test_on_platform "${PLATFORM}"
     publish_results "${PLATFORM}"
-    if [ -n "${COLLECT_DEMO_BINARIES}" ]; then
+    if [ -n "${COLLECT_DEMOS_BINARIES}" ]; then
       collect_demo_binaries "${PLATFORM}"
     fi
     if [ -z "${KEEP_TESTS}" ]; then

From 0f6ed75aca2c677e3582064ea5dedf07ca0b8bed Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Mon, 22 May 2023 13:19:00 +0200
Subject: [PATCH 05/16] use plural everywhere to be consistent

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 9e91e686143..5cac115f342 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -205,7 +205,7 @@ put_on_web()
 
 
 
-collect_demo_binaries()
+collect_demos_binaries()
 {
   PLATFORM=${1}
 
@@ -393,7 +393,7 @@ run_test_on_host()
     run_test_on_platform "${PLATFORM}"
     publish_results "${PLATFORM}"
     if [ -n "${COLLECT_DEMOS_BINARIES}" ]; then
-      collect_demo_binaries "${PLATFORM}"
+      collect_demos_binaries "${PLATFORM}"
     fi
     if [ -z "${KEEP_TESTS}" ]; then
       rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}

From 686db7277fdbc4309bd38423103ddc84c7c87308 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 25 May 2023 10:17:12 +0200
Subject: [PATCH 06/16] minor reorganization

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 5cac115f342..37665e70064 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -222,7 +222,9 @@ collect_demos_binaries()
       popd
     done
 
-    tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
+    tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*;
+  else
+    echo "Don't collect demos binaries for platform $PLATFORM";
   fi
 }
 
@@ -392,9 +394,8 @@ run_test_on_host()
   for PLATFORM in ${PLATFORMS}; do
     run_test_on_platform "${PLATFORM}"
     publish_results "${PLATFORM}"
-    if [ -n "${COLLECT_DEMOS_BINARIES}" ]; then
-      collect_demos_binaries "${PLATFORM}"
-    fi
+    collect_demos_binaries "${PLATFORM}"
+
     if [ -z "${KEEP_TESTS}" ]; then
       rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}
     fi

From 36b1971f0fae0e15938ac42597a5d0d4779d63c3 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 25 May 2023 10:33:55 +0200
Subject: [PATCH 07/16] make collect_demos_binaries() more consistent with the
 rest of the script

by using macros for TAR, COMPRESSOR, and variables describing paths
---
 Scripts/developer_scripts/run_testsuite_with_ctest | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 37665e70064..24d62c8266e 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -208,21 +208,24 @@ put_on_web()
 collect_demos_binaries()
 {
   PLATFORM=${1}
+  
+  cd "${CGAL_TEST_DIR}"
 
   if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
     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"
+    echo "cp ${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
+    cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
 
     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" "${CONFIG_TYPE}"
+      bash "${CGAL_BINARY_DIR}/test/"cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
       mv "${demo_dir}_with_dlls" ..
       popd
     done
 
-    tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*;
+    ${TAR} cf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
+    ${COMPRESSOR} -9f "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar"
   else
     echo "Don't collect demos binaries for platform $PLATFORM";
   fi

From 5b82ef33af6b4192bc63eb9239c7d0838674e7e3 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 25 May 2023 11:11:55 +0200
Subject: [PATCH 08/16] remove \ (made sense in autotest_cgal but not here)

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 24d62c8266e..8a67eced511 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -211,8 +211,9 @@ collect_demos_binaries()
   
   cd "${CGAL_TEST_DIR}"
 
-  if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
-    echo 'COLLECTING DEMOS BINARIES';
+  echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
+  if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
+    echo 'COLLECTING DEMOS BINARIES'
     echo "cp ${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
     cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
 

From 1e2024309656cdff99b6b8a06a3a2dd887382f4b Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 25 May 2023 12:13:53 +0200
Subject: [PATCH 09/16] replace ${CGAL_BINARY_DIR}/test by ${CGAL_TEST_DIR}

leftover from autotest_cgal
---
 Scripts/developer_scripts/run_testsuite_with_ctest | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 8a67eced511..6eb8e772d71 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -214,13 +214,13 @@ collect_demos_binaries()
   echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
   if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
     echo 'COLLECTING DEMOS BINARIES'
-    echo "cp ${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
-    cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
+    echo "cp ${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_TEST_DIR}"
+    cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_TEST_DIR}"
 
     for demo_dir in *_Demo; do
       echo "pushd ${demo_dir}"
       pushd "${demo_dir}"
-      bash "${CGAL_BINARY_DIR}/test/"cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
+      bash ${CGAL_TEST_DIR}/cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
       mv "${demo_dir}_with_dlls" ..
       popd
     done

From 3f30c77f55c3f33e728583a22db08e784cb5e698 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 25 May 2023 12:23:11 +0200
Subject: [PATCH 10/16] publish results AFTER collecting demos binaries

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 6eb8e772d71..ab529bfad0a 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -397,8 +397,8 @@ run_test_on_host()
 
   for PLATFORM in ${PLATFORMS}; do
     run_test_on_platform "${PLATFORM}"
-    publish_results "${PLATFORM}"
     collect_demos_binaries "${PLATFORM}"
+    publish_results "${PLATFORM}"
 
     if [ -z "${KEEP_TESTS}" ]; then
       rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}

From 4b7ba346f02047482a680d9c79a43e73b5dfe96f Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Tue, 30 May 2023 11:17:03 +0200
Subject: [PATCH 11/16] fix paths

---
 .../developer_scripts/run_testsuite_with_ctest    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index ab529bfad0a..9b89f708048 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -214,19 +214,22 @@ collect_demos_binaries()
   echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
   if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
     echo 'COLLECTING DEMOS BINARIES'
-    echo "cp ${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_TEST_DIR}"
-    cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_TEST_DIR}"
+
+    
+    DEMOS_TEST_DIR="${CGAL_DIR}/cmake/platforms/${PLATFORM}/test"
+    cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${DEMOS_TEST_DIR}"
+    
+    cd ${DEMOS_TEST_DIR}
 
     for demo_dir in *_Demo; do
       echo "pushd ${demo_dir}"
       pushd "${demo_dir}"
-      bash ${CGAL_TEST_DIR}/cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
-      mv "${demo_dir}_with_dlls" ..
+      bash ${DEMOS_TEST_DIR}/cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
       popd
     done
 
-    ${TAR} cf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
-    ${COMPRESSOR} -9f "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar"
+    ${TAR} cf "${DEMOS_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
+    ${COMPRESSOR} -9f "${DEMOS_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar"
   else
     echo "Don't collect demos binaries for platform $PLATFORM";
   fi

From 3c8821b7de62ab8c741a8a723c115e99a899d9f7 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Tue, 30 May 2023 11:23:40 +0200
Subject: [PATCH 12/16] mv each demo binaries to DEMOS_TEST_DIR

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 9b89f708048..0f70ef28454 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -225,6 +225,7 @@ collect_demos_binaries()
       echo "pushd ${demo_dir}"
       pushd "${demo_dir}"
       bash ${DEMOS_TEST_DIR}/cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
+      mv "${demo_dir}_with_dlls" ${DEMOS_TEST_DIR}
       popd
     done
 

From 10404c10544655f8cc9d0f6ed67fde0f54047777 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Tue, 30 May 2023 11:37:23 +0200
Subject: [PATCH 13/16] fix qwindows.dll path

---
 Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 58b1b906fd2..2af501d48c0 100644
--- a/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
+++ b/Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
@@ -43,4 +43,4 @@ for file in "${files[@]}"; do
   done; #check dependencies
 done #loop over directories
 mkdir -p "$target_directory/platforms"
-cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"
+cp "$Qt5_INSTALLATION_DIR/plugins/platforms/qwindows.dll" "$target_directory/platforms"

From c15199f3e5f1ae2d16f2805f723a6765bcf2284c Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Thu, 1 Jun 2023 08:31:58 +0200
Subject: [PATCH 14/16] avoid using "C:" in tar arguments. "C:" is part of
 DEMOS_TEST_DIR

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 0f70ef28454..e6cd93cf326 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -229,8 +229,9 @@ collect_demos_binaries()
       popd
     done
 
-    ${TAR} cf "${DEMOS_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
-    ${COMPRESSOR} -9f "${DEMOS_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar"
+    ${TAR} cf "demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
+    ${COMPRESSOR} -9f "demos_${CGAL_TESTER}_${PLATFORM}.tar"
+    mv "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" ${CGAL_TEST_DIR}
   else
     echo "Don't collect demos binaries for platform $PLATFORM";
   fi

From 0e3464e10d017c2ff0fdd280eeb92bf4045f4063 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Fri, 2 Jun 2023 09:45:04 +0200
Subject: [PATCH 15/16] scp the demos.tar.gz to public_html

---
 Scripts/developer_scripts/run_testsuite_with_ctest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index e6cd93cf326..7101c7462c2 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -273,7 +273,7 @@ publish_results()
     log "${ACTUAL_LOGFILE}.test.${PLATFORM}" "PUTTING RESULTS ON THE WEB"
     put_on_web "test_results-${HOST}_${PLATFORM}.tar.gz" "${FILENAME}"
     if [ -e "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" ]; then
-      put_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "demos-${FILENAME}"
+      put_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "public_html/demos-${FILENAME}"
     fi
     log_done "${ACTUAL_LOGFILE}"
   fi

From 49d0fcf88089917dd9a6bd6cdc6086c74ffe5c94 Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Tue, 6 Jun 2023 16:22:35 +0200
Subject: [PATCH 16/16] fix demos upload URL

---
 Scripts/developer_scripts/autotest_cgal_with_ctest | 1 +
 Scripts/developer_scripts/run_testsuite_with_ctest | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Scripts/developer_scripts/autotest_cgal_with_ctest b/Scripts/developer_scripts/autotest_cgal_with_ctest
index ccf560ac808..e9b0c851dbb 100755
--- a/Scripts/developer_scripts/autotest_cgal_with_ctest
+++ b/Scripts/developer_scripts/autotest_cgal_with_ctest
@@ -16,6 +16,7 @@ export CURL="curl"
 export CURL_OPTS="-k --remote-name --silent --location-trusted"
 export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
 export UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming"
+export UPLOAD_DEMOS_DESTINATION="cgaltest@cgaltest.geometryfactory.com:public_html/incoming"
 export LATEST_LOCATION="${CGAL_URL}/LATEST"
 export TAR="tar"
 export GUNZIP="gunzip"
diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 7101c7462c2..8c93c47f074 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -203,6 +203,12 @@ put_on_web()
   "$SCP" "${1}" "$UPLOAD_RESULT_DESTINATION/$2" >> "${ACTUAL_LOGFILE}"
 }
 
+put_demos_on_web()
+{
+  log "${ACTUAL_LOGFILE}" "Uploading demos ${1} to $UPLOAD_DEMOS_DESTINATION/$2"
+
+  "$SCP" "${1}" "$UPLOAD_DEMOS_DESTINATION/$2" >> "${ACTUAL_LOGFILE}"
+}
 
 
 collect_demos_binaries()
@@ -273,7 +279,7 @@ publish_results()
     log "${ACTUAL_LOGFILE}.test.${PLATFORM}" "PUTTING RESULTS ON THE WEB"
     put_on_web "test_results-${HOST}_${PLATFORM}.tar.gz" "${FILENAME}"
     if [ -e "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" ]; then
-      put_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "public_html/demos-${FILENAME}"
+      put_demos_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "demos-${FILENAME}"
     fi
     log_done "${ACTUAL_LOGFILE}"
   fi