From a4b5c68a93b6b285acaa093e2af9f1fb407c5b6a Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 17:09:55 -0700
Subject: [PATCH 1/7] Revise scripts for code gen tests

Avoid name clash that seems to have appeared with a recent
Scala version.
---
 compiler/lib/test/codegen/CppWriter/{cpp => gen_cpp}      | 0
 compiler/lib/test/codegen/CppWriter/{hpp => gen_hpp}      | 0
 .../lib/test/codegen/CppWriter/{otherCpp => gen_otherCpp} | 0
 compiler/lib/test/codegen/CppWriter/run                   | 8 +++++---
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename compiler/lib/test/codegen/CppWriter/{cpp => gen_cpp} (100%)
 rename compiler/lib/test/codegen/CppWriter/{hpp => gen_hpp} (100%)
 rename compiler/lib/test/codegen/CppWriter/{otherCpp => gen_otherCpp} (100%)

diff --git a/compiler/lib/test/codegen/CppWriter/cpp b/compiler/lib/test/codegen/CppWriter/gen_cpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/cpp
rename to compiler/lib/test/codegen/CppWriter/gen_cpp
diff --git a/compiler/lib/test/codegen/CppWriter/hpp b/compiler/lib/test/codegen/CppWriter/gen_hpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/hpp
rename to compiler/lib/test/codegen/CppWriter/gen_hpp
diff --git a/compiler/lib/test/codegen/CppWriter/otherCpp b/compiler/lib/test/codegen/CppWriter/gen_otherCpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/otherCpp
rename to compiler/lib/test/codegen/CppWriter/gen_otherCpp
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index a2247a786..364f31fdd 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -1,12 +1,14 @@
 #!/bin/sh
 
+cd `dirname $0`
+
 . ../../../../scripts/test-utils.sh
 
 cpp_doc_ok()
 {
-  ./hpp > C.hpp && \
-  ./cpp > C.cpp && \
-  ./otherCpp > Other.cpp && \
+  ./gen_hpp > C.hpp && \
+  ./gen_cpp > C.cpp && \
+  ./gen_otherCpp > Other.cpp && \
   gcc -c C.cpp Other.cpp
 }
 

From 30625a9116cb4160d85f07cbf80a865b50079b57 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 17:29:16 -0700
Subject: [PATCH 2/7] Display scala version

---
 compiler/lib/test/codegen/CppWriter/run | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index 364f31fdd..21d649f34 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -16,6 +16,7 @@ tests="
 cpp_doc_ok
 "
 
+scala --version
 echo 'compiling Scala source'
 if ./build > build_log.txt 2>&1
 then

From b9d9235b91e864b790adfab4bd2dedc26c645d99 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 17:57:26 -0700
Subject: [PATCH 3/7] Revert "Revise scripts for code gen tests"

This reverts commit a4b5c68a93b6b285acaa093e2af9f1fb407c5b6a.
---
 compiler/lib/test/codegen/CppWriter/{gen_cpp => cpp}      | 0
 compiler/lib/test/codegen/CppWriter/{gen_hpp => hpp}      | 0
 .../lib/test/codegen/CppWriter/{gen_otherCpp => otherCpp} | 0
 compiler/lib/test/codegen/CppWriter/run                   | 8 +++-----
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename compiler/lib/test/codegen/CppWriter/{gen_cpp => cpp} (100%)
 rename compiler/lib/test/codegen/CppWriter/{gen_hpp => hpp} (100%)
 rename compiler/lib/test/codegen/CppWriter/{gen_otherCpp => otherCpp} (100%)

diff --git a/compiler/lib/test/codegen/CppWriter/gen_cpp b/compiler/lib/test/codegen/CppWriter/cpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/gen_cpp
rename to compiler/lib/test/codegen/CppWriter/cpp
diff --git a/compiler/lib/test/codegen/CppWriter/gen_hpp b/compiler/lib/test/codegen/CppWriter/hpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/gen_hpp
rename to compiler/lib/test/codegen/CppWriter/hpp
diff --git a/compiler/lib/test/codegen/CppWriter/gen_otherCpp b/compiler/lib/test/codegen/CppWriter/otherCpp
similarity index 100%
rename from compiler/lib/test/codegen/CppWriter/gen_otherCpp
rename to compiler/lib/test/codegen/CppWriter/otherCpp
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index 21d649f34..e2880764d 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -1,14 +1,12 @@
 #!/bin/sh
 
-cd `dirname $0`
-
 . ../../../../scripts/test-utils.sh
 
 cpp_doc_ok()
 {
-  ./gen_hpp > C.hpp && \
-  ./gen_cpp > C.cpp && \
-  ./gen_otherCpp > Other.cpp && \
+  ./hpp > C.hpp && \
+  ./cpp > C.cpp && \
+  ./otherCpp > Other.cpp && \
   gcc -c C.cpp Other.cpp
 }
 

From dbb8d18a11ae8c8cfb4a8715d4d43290eea14ba2 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 18:06:47 -0700
Subject: [PATCH 4/7] Revise code gen test

Work around changes in scala
---
 compiler/lib/test/codegen/CppWriter/run | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index e2880764d..3d3f767e0 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -14,7 +14,13 @@ tests="
 cpp_doc_ok
 "
 
-scala --version
+# As of scala 3.5.0, the runner has changed
+if scala --version 2>&1 | grep -q 'Scala code runner version:'
+then
+  echo 'installed scala version is incompatible with this test'
+  exit 0
+fi
+
 echo 'compiling Scala source'
 if ./build > build_log.txt 2>&1
 then

From d4ed1c67d7ead82f1d7e45a99c1b43e1bb0673b4 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 18:16:20 -0700
Subject: [PATCH 5/7] Revise code gen test

Attempt to be compatible with Scala 3.5.0
---
 compiler/lib/test/codegen/CppWriter/cpp      | 2 +-
 compiler/lib/test/codegen/CppWriter/hpp      | 2 +-
 compiler/lib/test/codegen/CppWriter/otherCpp | 2 +-
 compiler/lib/test/codegen/CppWriter/run      | 7 -------
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/compiler/lib/test/codegen/CppWriter/cpp b/compiler/lib/test/codegen/CppWriter/cpp
index c002aa6e3..4bcb3318b 100755
--- a/compiler/lib/test/codegen/CppWriter/cpp
+++ b/compiler/lib/test/codegen/CppWriter/cpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala cpp
+scala repl cpp
diff --git a/compiler/lib/test/codegen/CppWriter/hpp b/compiler/lib/test/codegen/CppWriter/hpp
index 7fa8ea7a6..52083fb38 100755
--- a/compiler/lib/test/codegen/CppWriter/hpp
+++ b/compiler/lib/test/codegen/CppWriter/hpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala hpp
+scala repl hpp
diff --git a/compiler/lib/test/codegen/CppWriter/otherCpp b/compiler/lib/test/codegen/CppWriter/otherCpp
index 1fe7c1f8e..a5321994f 100755
--- a/compiler/lib/test/codegen/CppWriter/otherCpp
+++ b/compiler/lib/test/codegen/CppWriter/otherCpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala otherCpp
+scala repl otherCpp
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index 3d3f767e0..a2247a786 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -14,13 +14,6 @@ tests="
 cpp_doc_ok
 "
 
-# As of scala 3.5.0, the runner has changed
-if scala --version 2>&1 | grep -q 'Scala code runner version:'
-then
-  echo 'installed scala version is incompatible with this test'
-  exit 0
-fi
-
 echo 'compiling Scala source'
 if ./build > build_log.txt 2>&1
 then

From 3529219ae59c31c8696a4d6b595475ee798fe9f8 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Mon, 26 Aug 2024 18:20:12 -0700
Subject: [PATCH 6/7] Revert "Revise code gen test"

This reverts commit d4ed1c67d7ead82f1d7e45a99c1b43e1bb0673b4.
---
 compiler/lib/test/codegen/CppWriter/cpp      | 2 +-
 compiler/lib/test/codegen/CppWriter/hpp      | 2 +-
 compiler/lib/test/codegen/CppWriter/otherCpp | 2 +-
 compiler/lib/test/codegen/CppWriter/run      | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/compiler/lib/test/codegen/CppWriter/cpp b/compiler/lib/test/codegen/CppWriter/cpp
index 4bcb3318b..c002aa6e3 100755
--- a/compiler/lib/test/codegen/CppWriter/cpp
+++ b/compiler/lib/test/codegen/CppWriter/cpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala repl cpp
+scala cpp
diff --git a/compiler/lib/test/codegen/CppWriter/hpp b/compiler/lib/test/codegen/CppWriter/hpp
index 52083fb38..7fa8ea7a6 100755
--- a/compiler/lib/test/codegen/CppWriter/hpp
+++ b/compiler/lib/test/codegen/CppWriter/hpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala repl hpp
+scala hpp
diff --git a/compiler/lib/test/codegen/CppWriter/otherCpp b/compiler/lib/test/codegen/CppWriter/otherCpp
index a5321994f..1fe7c1f8e 100755
--- a/compiler/lib/test/codegen/CppWriter/otherCpp
+++ b/compiler/lib/test/codegen/CppWriter/otherCpp
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-scala repl otherCpp
+scala otherCpp
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index a2247a786..3d3f767e0 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -14,6 +14,13 @@ tests="
 cpp_doc_ok
 "
 
+# As of scala 3.5.0, the runner has changed
+if scala --version 2>&1 | grep -q 'Scala code runner version:'
+then
+  echo 'installed scala version is incompatible with this test'
+  exit 0
+fi
+
 echo 'compiling Scala source'
 if ./build > build_log.txt 2>&1
 then

From a7c2899d2aa54c7ccffe153477450ae7d379cfe8 Mon Sep 17 00:00:00 2001
From: Rob Bocchino <bocchino@jpl.nasa.gov>
Date: Tue, 27 Aug 2024 09:07:41 -0700
Subject: [PATCH 7/7] Revise run script for cppdoc tests

---
 .../lib/test/codegen/CppWriter/.gitignore     |  1 +
 compiler/lib/test/codegen/CppWriter/run       | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compiler/lib/test/codegen/CppWriter/.gitignore b/compiler/lib/test/codegen/CppWriter/.gitignore
index 7b3aa20b7..b00609714 100644
--- a/compiler/lib/test/codegen/CppWriter/.gitignore
+++ b/compiler/lib/test/codegen/CppWriter/.gitignore
@@ -3,3 +3,4 @@
 *.hpp.gch
 *.o
 build_log.txt
+hpp_log.txt
diff --git a/compiler/lib/test/codegen/CppWriter/run b/compiler/lib/test/codegen/CppWriter/run
index 3d3f767e0..5c1ec6fbc 100755
--- a/compiler/lib/test/codegen/CppWriter/run
+++ b/compiler/lib/test/codegen/CppWriter/run
@@ -14,19 +14,21 @@ tests="
 cpp_doc_ok
 "
 
-# As of scala 3.5.0, the runner has changed
-if scala --version 2>&1 | grep -q 'Scala code runner version:'
+echo 'compiling Scala source'
+if ! ./build > build_log.txt 2>&1
 then
-  echo 'installed scala version is incompatible with this test'
+  echo 'compilation failed'
+  echo 'scalac version 2.13.1 or greater required'
+  echo 'see build_log.txt' for details
   exit 0
 fi
 
-echo 'compiling Scala source'
-if ./build > build_log.txt 2>&1
+if ! ./hpp > hpp_log.txt 2>&1
 then
-  run_suite $tests
-else
-  echo 'compilation failed'
-  echo 'scalac version 2.13.1 or greater required'
-  echo 'see build_log.txt for details'
+  echo 'cannot run hpp'
+  echo 'scala version 3.4 or earlier is required'
+  echo 'see hpp_log.txt' for details
+  exit 0
 fi
+
+run_suite $tests