Refactor tests.

TestMaster -> TestMasked
Refactor names of result files.
Version-dependent use of master/masked.

Author: jblueh

tests/results/FirstOrderReverseMaster.ref tests/results/FirstOrderReverseMasked.reftests/results/FirstOrderReverseMaster.ref renamed to tests/results/FirstOrderReverseMasked.ref

@@ -83,7 +83,11 @@ struct TestExternalFunctionGlobal : public TestBase<4, 1, 3, TestExternalFunctio
 
         OPDI_BARRIER()
 
-        OPDI_MASTER()
+        #if _OPENMP >= 202011
+          OPDI_MASKED()
+        #else
+          OPDI_MASTER()
+        #endif
         {
           eh = new ExternalFunctionHelper<T>(true);
           for (int i = 0; i < N; ++i) {
@@ -94,7 +98,11 @@ struct TestExternalFunctionGlobal : public TestBase<4, 1, 3, TestExternalFunctio
             eh->addOutput(intermediate[i]);
           }
         }
-        OPDI_END_MASTER
+        #if _OPENMP >= 202011
+          OPDI_END_MASKED
+        #else
+          OPDI_END_MASTER
+        #endif
 
         OPDI_BARRIER()
 
@@ -113,11 +121,19 @@ struct TestExternalFunctionGlobal : public TestBase<4, 1, 3, TestExternalFunctio
           jobResults[i] = cos(exp(intermediate[i]));
         }
 
-        OPDI_MASTER()
+        #if _OPENMP >= 202011
+          OPDI_MASKED()
+        #else
+          OPDI_MASTER()
+        #endif
         {
           delete eh;
         }
-        OPDI_END_MASTER
+        #if _OPENMP >= 202011
+          OPDI_END_MASKED
+        #else
+          OPDI_END_MASTER
+        #endif
       }
       OPDI_END_PARALLEL
 

…irstOrderReverseNestedParallelMaster.ref …irstOrderReverseNestedParallelMasked.reftests/results/FirstOrderReverseNestedParallelMaster.ref renamed to tests/results/FirstOrderReverseNestedParallelMasked.ref tests/results/FirstOrderReverseNestedParallelMaster.ref renamed to tests/results/FirstOrderReverseNestedParallelMasked.ref

@@ -116,7 +116,11 @@ struct TestExternalFunctionLogicCalls : public TestBase<4, 1, 3, TestExternalFun
 
         OPDI_BARRIER()
 
-        OPDI_MASTER()
+        #if _OPENMP >= 202011
+          OPDI_MASKED()
+        #else
+          OPDI_MASTER()
+        #endif
         {
           eh = new ExternalFunctionHelper<T>(true);
           for (int i = 0; i < N; ++i) {
@@ -127,7 +131,11 @@ struct TestExternalFunctionLogicCalls : public TestBase<4, 1, 3, TestExternalFun
             eh->addOutput(intermediate[i]);
           }
         }
-        OPDI_END_MASTER
+        #if _OPENMP >= 202011
+          OPDI_END_MASKED
+        #else
+          OPDI_END_MASTER
+        #endif
 
         OPDI_BARRIER()
 
@@ -146,11 +154,19 @@ struct TestExternalFunctionLogicCalls : public TestBase<4, 1, 3, TestExternalFun
           jobResults[i] = cos(exp(intermediate[i]));
         }
 
-        OPDI_MASTER()
+        #if _OPENMP >= 202011
+          OPDI_MASKED()
+        #else
+          OPDI_MASTER()
+        #endif
         {
           delete eh;
         }
-        OPDI_END_MASTER
+        #if _OPENMP >= 202011
+          OPDI_END_MASKED
+        #else
+          OPDI_END_MASTER
+        #endif
       }
       OPDI_END_PARALLEL
 

…ults/FirstOrderReverseNoOpenMPMaster.ref …ults/FirstOrderReverseNoOpenMPMasked.reftests/results/FirstOrderReverseNoOpenMPMaster.ref renamed to tests/results/FirstOrderReverseNoOpenMPMasked.ref tests/results/FirstOrderReverseNoOpenMPMaster.ref renamed to tests/results/FirstOrderReverseNoOpenMPMasked.ref

@@ -28,10 +28,10 @@
 #include "testBase.hpp"
 
 template<typename _Case>
-struct TestMaster : public TestBase<4, 1, 3, TestMaster<_Case>> {
+struct TestMasked : public TestBase<4, 1, 3, TestMasked<_Case>> {
   public:
     using Case = _Case;
-    using Base = TestBase<4, 1, 3, TestMaster<Case>>;
+    using Base = TestBase<4, 1, 3, TestMasked<Case>>;
 
     template<typename T>
     static void test(std::array<T, Base::nIn> const& in, std::array<T, Base::nOut>& out) {
@@ -51,13 +51,21 @@ struct TestMaster : public TestBase<4, 1, 3, TestMaster<_Case>> {
 
         OPDI_BARRIER()
 
-        OPDI_MASTER()
+        #if _OPENMP >= 202011
+          OPDI_MASKED()
+        #else
+          OPDI_MASTER()
+        #endif
         {
           for (int i = 0; i < N; ++i) {
             out[0] += jobResults[i];
           }
         }
-        OPDI_END_MASTER
+        #if _OPENMP >= 202011
+          OPDI_END_MASKED
+        #else
+          OPDI_END_MASTER
+        #endif
       }
       OPDI_END_PARALLEL