Merge branch 'test-cleanup-fix':

shaih · shaih · commit d3d7a618ec2f · 2019-04-08T10:41:42.000-04:00
Clean up debugging globals between test runs - fixes segfault when calling ./bin/runTests
diff --git a/src/debugging.h b/src/debugging.h
@@ -36,6 +36,15 @@ extern EncryptedArray* dbgEa;
 extern NTL::ZZX dbg_ptxt;
 extern NTL::Vec<NTL::ZZ> ptxt_pwr; // powerful basis
 
+// Cleanup method for using the above debug variables several times in one process
+inline void cleanupGlobals()
+{
+  dbgKey = nullptr;
+  dbgEa = nullptr;
+  dbg_ptxt = NTL::ZZX{};
+  ptxt_pwr = NTL::Vec<NTL::ZZ>{};
+}
+
 void decryptAndPrint(std::ostream& s, const Ctxt& ctxt, const FHESecKey& sk,
 		     const EncryptedArray& ea, long flags=0);
 
diff --git a/src/tests/GTest_Bin_IO.cpp b/src/tests/GTest_Bin_IO.cpp
@@ -20,6 +20,7 @@
 #include "FHE.h"
 #include "timing.h"
 #include "EncryptedArray.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -171,6 +172,11 @@ class GTest_Bin_IO : public ::testing::TestWithParam<Parameters> {
             // Nothing clear to do here for now the way the test is written
         };
 
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
+
     public:
         static void SetUpTestCase() {
             testResourcePath = getTestResourcePath();
diff --git a/src/tests/GTest_EaCx.cpp b/src/tests/GTest_EaCx.cpp
@@ -87,6 +87,13 @@ class GTest_EaCx : public ::testing::TestWithParam<Parameters> {
 #endif
             }
         }
+
+        virtual void TearDown() override
+        {
+#ifdef DEBUG_PRINTOUT
+            cleanupGlobals();
+#endif
+        }
 };
 
 TEST_P(GTest_EaCx, encoding_works_correctly)
diff --git a/src/tests/GTest_EvalMap.cpp b/src/tests/GTest_EvalMap.cpp
@@ -15,6 +15,7 @@
 #include "EvalMap.h"
 #include "hypercube.h"
 #include "powerful.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -180,6 +181,11 @@ class GTest_EvalMap : public ::testing::TestWithParam<Parameters> {
             addSome1DMatrices(secretKey); // compute key-switching matrices that we need
             addFrbMatrices(secretKey); // compute key-switching matrices that we need
         };
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 
diff --git a/src/tests/GTest_General.cpp b/src/tests/GTest_General.cpp
@@ -161,7 +161,8 @@ class GTest_General : public ::testing::TestWithParam<Parameters> {
 
         virtual void TearDown() override
         {
-        };
+            cleanupGlobals();
+        }
 };
 
 TEST_P(GTest_General, correctly_implements_mix_of_operations_over_four_ciphertexts)
diff --git a/src/tests/GTest_IO.cpp b/src/tests/GTest_IO.cpp
@@ -19,6 +19,7 @@
 #include "FHE.h"
 #include "timing.h"
 #include "EncryptedArray.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -110,6 +111,11 @@ class GTest_IO : public ::testing::TestWithParam<Parameters> {
         std::vector<std::unique_ptr<EncryptedArray>> eas;
         std::vector<std::vector<NTL::ZZX>> ptxts;
 
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
+
     public:
         static void SetUpTestCase() {
             keyFilePath = getTestResourcePath() + "/iotest.txt";
diff --git a/src/tests/GTest_PAlgebra.cpp b/src/tests/GTest_PAlgebra.cpp
@@ -15,6 +15,7 @@
 #include <NTL/ZZ.h>
 #include "NumbTh.h"
 #include "FHEContext.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -86,7 +87,10 @@ class GTest_PAlgebra : public ::testing::TestWithParam<Parameters> {
             }
         };
 
-
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 TEST_P(GTest_PAlgebra, reads_and_writes_contexts_as_strings)
diff --git a/src/tests/GTest_Permutations.cpp b/src/tests/GTest_Permutations.cpp
@@ -16,6 +16,7 @@
 #include "timing.h"
 #include "permutations.h"
 #include "EncryptedArray.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -113,6 +114,11 @@ class GTest_Permutations : public ::testing::TestWithParam<Parameters> {
         virtual void SetUp() override {
             setDryRun(helib_test::dry);
         };
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 void testCube(NTL::Vec<GenDescriptor>& vec, long widthBound)
diff --git a/src/tests/GTest_PolyEval.cpp b/src/tests/GTest_PolyEval.cpp
@@ -13,6 +13,7 @@
 #include <NTL/ZZ.h>
 #include "polyEval.h"
 #include "EncryptedArray.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -101,6 +102,11 @@ class GTest_PolyEval : public ::testing::TestWithParam<Parameters>
         if (!helib_test::noPrint) std::cout << (isDryRun()? "* dry run, " : "* ")
         << "degree-"<<d<<", m="<<m<<", L="<<L<<", p^r="<<p2r<<std::endl;
     };
+
+    virtual void TearDown() override
+    {
+      cleanupGlobals();
+    }
 };
 
 
diff --git a/src/tests/GTest_Powerful.cpp b/src/tests/GTest_Powerful.cpp
@@ -12,6 +12,7 @@
 #include "hypercube.h"
 #include "powerful.h"
 #include "FHEContext.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -78,6 +79,11 @@ class GTest_Powerful : public ::testing::TestWithParam<Parameters>
         {
             buildModChain(context, /*L=*/9, /*c=*/3);
         };
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 TEST_P(GTest_Powerful, simple_conversion_works)
diff --git a/src/tests/GTest_PtrVector.cpp b/src/tests/GTest_PtrVector.cpp
@@ -15,6 +15,7 @@
 #include "NumbTh.h"
 #include "PtrVector.h"
 #include "PtrMatrix.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -37,6 +38,12 @@ class GTest_PtrVector : public ::testing::Test {
             vLength(6),
             zero(0)
     {};
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
+
         const int vLength;
         MyClass zero;
 };
diff --git a/src/tests/GTest_Replicate.cpp b/src/tests/GTest_Replicate.cpp
@@ -21,6 +21,7 @@
 #include "FHE.h"
 #include "replicate.h"
 #include "timing.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -108,6 +109,11 @@ class GTest_Replicate : public ::testing::TestWithParam<Parameters> {
             xc1 = xc0;
         };
 
+        virtual void TearDown() override
+        {
+          cleanupGlobals();
+        }
+
         const long m;
         const long p;
         const long r;
diff --git a/src/tests/GTest_ThinBootstrapping.cpp b/src/tests/GTest_ThinBootstrapping.cpp
@@ -283,6 +283,12 @@ class GTest_ThinBootstrapping : public ::testing::TestWithParam<Parameters> {
             nslots(context.zMStar.getPhiM()/d)
     {};
 
+        virtual void TearDown() override
+        {
+          cleanupGlobals();
+        }
+
+
         const long p;
         const long r;
         const long c;
diff --git a/src/tests/GTest_ThinEvalMap.cpp b/src/tests/GTest_ThinEvalMap.cpp
@@ -16,6 +16,7 @@
 #include "EncryptedArray.h"
 #include "EvalMap.h"
 #include <NTL/BasicThreadPool.h>
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -184,6 +185,7 @@ class GTest_ThinEvalMap : public ::testing::TestWithParam<Parameters> {
                 printAllTimers();
                 std::cout << std::endl;
             }
+            cleanupGlobals();
         }
 
 };
diff --git a/src/tests/GTest_approxNums.cpp b/src/tests/GTest_approxNums.cpp
@@ -199,6 +199,11 @@ class GTest_approxNums : public ::testing::TestWithParam<Parameters> {
 //          }
         }
 
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
+
 };
 
 TEST_P(GTest_approxNums, basic_arithmetic_works)
diff --git a/src/tests/GTest_binaryArith.cpp b/src/tests/GTest_binaryArith.cpp
@@ -230,6 +230,13 @@ class GTest_binaryArith : public ::testing::TestWithParam<std::tuple<Parameters,
 #endif
         }
 
+        virtual void TearDown() override
+        {
+#ifdef DEBUG_PRINTOUT
+            cleanupGlobals();
+#endif
+        }
+
         // This gets called once all of the tests have run
     public:
         static void TearDownTestCase ()
diff --git a/src/tests/GTest_binaryCompare.cpp b/src/tests/GTest_binaryCompare.cpp
@@ -206,6 +206,13 @@ class GTest_binaryCompare : public ::testing::TestWithParam<std::tuple<Parameter
 #endif
         };
 
+        virtual void TearDown() override
+        {
+#ifdef DEBUG_PRINTOUT
+            cleanupGlobals();
+#endif
+        }
+
     public:
         static void TearDownTestCase ()
         {
diff --git a/src/tests/GTest_bootstrapping.cpp b/src/tests/GTest_bootstrapping.cpp
@@ -184,6 +184,11 @@ class GTest_bootstrapping : public ::testing::TestWithParam<Parameters> {
             fhe_test_force_bsgs = GetParam().force_bsgs;
             fhe_test_force_hoist = GetParam().force_hoist;
         };
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 constexpr long GTest_bootstrapping::mValues[][14];
diff --git a/src/tests/GTest_extractDigits.cpp b/src/tests/GTest_extractDigits.cpp
@@ -108,8 +108,8 @@ class GTest_extractDigits : public ::testing::TestWithParam<Parameters> {
 
         virtual void TearDown() override
         {
-            // Put teardown that could throw here instead of the fixture's destructor
-        };
+            cleanupGlobals();
+        }
 };
 
 TEST_P(GTest_extractDigits, correctly_extracts_digits)
diff --git a/src/tests/GTest_intraSlot.cpp b/src/tests/GTest_intraSlot.cpp
@@ -11,6 +11,7 @@
  */
 // testPacking.cxx - testing uppack/repack functionality
 #include "intraSlot.h"
+#include "debugging.h"
 
 #include "gtest/gtest.h"
 #include "test_common.h"
@@ -88,6 +89,11 @@ class GTest_intraSlot : public ::testing::TestWithParam<Parameters> {
             addSome1DMatrices(secretKey); // compute key-switching matrices that we need
             addFrbMatrices(secretKey);
         };
+
+        virtual void TearDown() override
+        {
+            cleanupGlobals();
+        }
 };
 
 TEST_P(GTest_intraSlot, packing_and_unpacking_works)
diff --git a/src/tests/GTest_matmul.cpp b/src/tests/GTest_matmul.cpp
@@ -43,6 +43,7 @@
  *   BlockMatMulFull* buildRandomFullBlockMatrix(const EncryptedArray& ea);
  */
 
+#include "debugging.h"
 #include "gtest/gtest.h"
 #include "test_common.h"
 
@@ -239,6 +240,7 @@ class GTest_matmul : public ::testing::Test {
                 std::cout << "  rusage.ru_maxrss="<<rusage.ru_maxrss << std::endl;
 #endif
             }
+            cleanupGlobals();
         };
 };
 
diff --git a/src/tests/GTest_tableLookup.cpp b/src/tests/GTest_tableLookup.cpp
@@ -245,6 +245,13 @@ class GTest_tableLookup : public ::testing::TestWithParam<Parameters> {
 #endif
         };
 
+        virtual void TearDown() override
+        {
+#ifdef DEBUG_PRINTOUT
+            cleanupGlobals();
+#endif
+        }
+
     public:
         static void TearDownTestCase()
         {

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,13 @@ class GTest_EaCx : public ::testing::TestWithParam<Parameters> {`
`87`	`87`	`#endif`
`88`	`88`	`}`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ virtual void TearDown() override`
	`92`	`+ {`
	`93`	`+#ifdef DEBUG_PRINTOUT`
	`94`	`+ cleanupGlobals();`
	`95`	`+#endif`
	`96`	`+ }`
`90`	`97`	`};`
`91`	`98`
`92`	`99`	`TEST_P(GTest_EaCx, encoding_works_correctly)`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@ class GTest_General : public ::testing::TestWithParam<Parameters> {`
`161`	`161`
`162`	`162`	`virtual void TearDown() override`
`163`	`163`	`{`
`164`		`- };`
	`164`	`+ cleanupGlobals();`
	`165`	`+ }`
`165`	`166`	`};`
`166`	`167`
`167`	`168`	`TEST_P(GTest_General, correctly_implements_mix_of_operations_over_four_ciphertexts)`