From 61a39cc95bcf5a0e72e1f13d2e921423c24bc04b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Thu, 22 Jun 2023 10:11:24 +0200
Subject: [PATCH 1/4] disable MSVC 2015 starting with CGAL 6.0

---
 .../run_testsuite_with_ctest                  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index 8c93c47f0747..9c47517049e1 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -105,6 +105,13 @@ collect_all_current_platforms()
 build_platforms_list()
 {
   for LOCAL_PLATFORM in $1; do
+    # MSVC2015 does not support C++17
+    if [ $1 \> "CGAL-6.0" ]; then
+      if [ "LOCAL_PLATFORM" = "MSVC2015-Release-64bits" ]; then
+        continue
+      fi
+    fi
+
     if [ "${LOCAL_PLATFORM}" = "all" ] ; then
       USE_REFERENCE_PLATFORMS='y'
     else
@@ -116,7 +123,7 @@ build_platforms_list()
 
 # ----------------------------------------------------------------------------------------
 # Sets up the variables indicating the directories to use.
-# Crates all platform directories under the current release binary folder.
+# Creates all platform directories under the current release binary folder.
 # ----------------------------------------------------------------------------------------
 setup_dirs()
 {
@@ -170,8 +177,8 @@ setup_dirs()
   # directories existing in the reference release are added to $PLATFORMS
   #
   PLATFORMS=""
-  build_platforms_list "`value_of BUILD_ON_${HOST}`"
-  build_platforms_list "`value_of COMPILERS_${HOST}`"
+  build_platforms_list "`value_of BUILD_ON_${HOST}`" "${CGAL_RELEASE_ID}"
+  build_platforms_list "`value_of COMPILERS_${HOST}`" "${CGAL_RELEASE_ID}"
 
   if [ -n "${USE_REFERENCE_PLATFORMS}" ]; then
     collect_all_reference_platforms
@@ -214,17 +221,17 @@ put_demos_on_web()
 collect_demos_binaries()
 {
   PLATFORM=${1}
-  
+
   cd "${CGAL_TEST_DIR}"
 
   echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
   if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
     echo 'COLLECTING DEMOS BINARIES'
 
-    
+
     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

From 98e3dbb6e372732741f3400be83c6974a5cbde12 Mon Sep 17 00:00:00 2001
From: Sebastien Loriot <sloriot.ml@gmail.com>
Date: Thu, 22 Jun 2023 10:26:19 +0200
Subject: [PATCH 2/4] D'oh!

Co-authored-by: Laurent Rineau <Laurent.Rineau@cgal.org>
---
 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 9c47517049e1..b86a5b9f705e 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -106,7 +106,7 @@ build_platforms_list()
 {
   for LOCAL_PLATFORM in $1; do
     # MSVC2015 does not support C++17
-    if [ $1 \> "CGAL-6.0" ]; then
+    if [ $2 \> "CGAL-6.0" ]; then
       if [ "LOCAL_PLATFORM" = "MSVC2015-Release-64bits" ]; then
         continue
       fi

From 72044ffed4ef0ab1f6d3b580b41616258d294b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Wed, 5 Jul 2023 09:54:22 +0200
Subject: [PATCH 3/4] move test to make sure it is not re-added later

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

diff --git a/Scripts/developer_scripts/run_testsuite_with_ctest b/Scripts/developer_scripts/run_testsuite_with_ctest
index b86a5b9f705e..3e13edc6a7e3 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -105,13 +105,6 @@ collect_all_current_platforms()
 build_platforms_list()
 {
   for LOCAL_PLATFORM in $1; do
-    # MSVC2015 does not support C++17
-    if [ $2 \> "CGAL-6.0" ]; then
-      if [ "LOCAL_PLATFORM" = "MSVC2015-Release-64bits" ]; then
-        continue
-      fi
-    fi
-
     if [ "${LOCAL_PLATFORM}" = "all" ] ; then
       USE_REFERENCE_PLATFORMS='y'
     else
@@ -177,8 +170,8 @@ setup_dirs()
   # directories existing in the reference release are added to $PLATFORMS
   #
   PLATFORMS=""
-  build_platforms_list "`value_of BUILD_ON_${HOST}`" "${CGAL_RELEASE_ID}"
-  build_platforms_list "`value_of COMPILERS_${HOST}`" "${CGAL_RELEASE_ID}"
+  build_platforms_list "`value_of BUILD_ON_${HOST}`"
+  build_platforms_list "`value_of COMPILERS_${HOST}`"
 
   if [ -n "${USE_REFERENCE_PLATFORMS}" ]; then
     collect_all_reference_platforms
@@ -186,6 +179,13 @@ setup_dirs()
 
   for PLATFORM in ${PLATFORMS}; do
 
+    # MSVC2015 does not support C++17
+    if [ "${CGAL_RELEASE_ID}" \> "CGAL-6.0" ]; then
+      if [ "PLATFORM" = "MSVC2015-Release-64bits" ]; then
+        continue
+      fi
+    fi
+
     CGAL_BINARY_DIR=${CGAL_BINARY_DIR_BASE}/${PLATFORM}
 
     if [ ! -d "${CGAL_BINARY_DIR}" ]; then

From 404bc84696ac744bc16f68ab839808909c1ce43f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= <sebastien.loriot@cgal.org>
Date: Thu, 6 Jul 2023 09:37:02 +0200
Subject: [PATCH 4/4] missing ${}

---
 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 3e13edc6a7e3..723b3938d2ce 100644
--- a/Scripts/developer_scripts/run_testsuite_with_ctest
+++ b/Scripts/developer_scripts/run_testsuite_with_ctest
@@ -181,7 +181,7 @@ setup_dirs()
 
     # MSVC2015 does not support C++17
     if [ "${CGAL_RELEASE_ID}" \> "CGAL-6.0" ]; then
-      if [ "PLATFORM" = "MSVC2015-Release-64bits" ]; then
+      if [ "${PLATFORM}" = "MSVC2015-Release-64bits" ]; then
         continue
       fi
     fi