Merge pull request #456 from genn-team/update_gtest

Update google test
genn-team · Sep 14, 2021 · a7ddf5c · a7ddf5c
2 parents 967ffba + 16456f6
commit a7ddf5c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,18 +8,18 @@ properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '',
 
 // All the types of build we'll ideally run if suitable nodes exist
 def desiredBuilds = [
+    ["cuda11", "windows"] as Set,
     ["cuda10", "windows"] as Set,
     ["cuda9", "windows"] as Set,
-    ["opencl", "windows"] as Set,
-    ["cpu_only", "windows"] as Set,
+    ["amd", "windows"] as Set,
+    ["cuda11", "linux"] as Set,
     ["cuda10", "linux"] as Set,
     ["cuda9", "linux"] as Set,
-    ["cpu_only", "linux"] as Set,
-    ["opencl", "linux"] as Set,
+    ["amd", "linux"] as Set,
+    ["cuda11", "mac"] as Set,
     ["cuda10", "mac"] as Set,
     ["cuda9", "mac"] as Set,
-    ["cpu_only", "mac"] as Set,
-    ["opencl", "mac"] as Set]
+    ["amd", "mac"] as Set]
 
 //--------------------------------------------------------------------------
 // Helper functions
@@ -93,7 +93,7 @@ for(b = 0; b < builderNodes.size(); b++) {
 
             // Customise this nodes environment so GeNN and googletest environment variables are set and genn binaries are in path
             // **NOTE** these are NOT set directly using env.PATH as this makes the change across ALL nodes which means you get a randomly mangled path depending on node startup order
-            withEnv(["GTEST_DIR=" + pwd() + "/googletest-release-1.8.1/googletest",
+            withEnv(["GTEST_DIR=" + pwd() + "/googletest-release-1.11.0/googletest",
                      "PATH+GENN=" + pwd() + "/genn/bin"]) {
                 stage(installationStageName) {
                     echo "Checking out GeNN";
@@ -117,14 +117,14 @@ for(b = 0; b < builderNodes.size(); b++) {
                         setBuildStatus(installationStageName, "PENDING");
 
                         // If google test doesn't exist
-                        if(!fileExists("googletest-release-1.8.1")) {
+                        if(!fileExists("googletest-release-1.11.0")) {
                             echo "Downloading google test framework";
 
                             // Download it
-                            httpRequest url:"https://github.com/google/googletest/archive/release-1.8.1.zip", outputFile :"release-1.8.1.zip";
+                            httpRequest url:"https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip", outputFile :"release-1.11.0.zip";
 
                             // Unarchive it
-                            unzip "release-1.8.1.zip";
+                            unzip "release-1.11.0.zip";
                         }
                     } catch (Exception e) {
                         setBuildStatus(installationStageName, "FAILURE");

diff --git a/tests/features/connect_init/test.cc b/tests/features/connect_init/test.cc
@@ -6,6 +6,7 @@ suite of minimal models with known analytic outcomes that are used for continuou
 */
 //--------------------------------------------------------------------------
 // Standard C++ includes
+#include <algorithm>
 #include <array>
 #include <numeric>
 

diff --git a/tests/features/custom_update/test.cc b/tests/features/custom_update/test.cc
@@ -6,6 +6,7 @@ suite of minimal models with known analytic outcomes that are used for continuou
 */
 //--------------------------------------------------------------------------
 // Standard C++ includes
+#include <algorithm>
 #include <array>
 #include <numeric>
 

diff --git a/tests/features/custom_update_batch/test.cc b/tests/features/custom_update_batch/test.cc
@@ -6,6 +6,7 @@ suite of minimal models with known analytic outcomes that are used for continuou
 */
 //--------------------------------------------------------------------------
 // Standard C++ includes
+#include <algorithm>
 #include <array>
 #include <numeric>
 

diff --git a/tests/features/custom_update_delay/test.cc b/tests/features/custom_update_delay/test.cc
@@ -6,6 +6,7 @@ suite of minimal models with known analytic outcomes that are used for continuou
 */
 //--------------------------------------------------------------------------
 // Standard C++ includes
+#include <algorithm>
 #include <array>
 #include <numeric>
 

diff --git a/tests/unit/codeGenUtils.cc b/tests/unit/codeGenUtils.cc
@@ -115,9 +115,9 @@ TEST_P(SingleValueSubstitutionTest, CorrectGeneratedValue)
 //--------------------------------------------------------------------------
 // Instatiations
 //--------------------------------------------------------------------------
-INSTANTIATE_TEST_CASE_P(DoubleValues,
-                        SingleValueSubstitutionTest,
-                        ::testing::Values(std::numeric_limits<double>::min(),
-                                          std::numeric_limits<double>::max(),
-                                          1.0,
-                                          -1.0),);
+INSTANTIATE_TEST_SUITE_P(DoubleValues,
+                         SingleValueSubstitutionTest,
+                         ::testing::Values(std::numeric_limits<double>::min(),
+                                           std::numeric_limits<double>::max(),
+                                           1.0,
+                                           -1.0));