HPCC-18936 Allow a timing unit test to be run individually

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

roxie/roxiemem/roxiemem.cpp

@@ -8393,9 +8393,9 @@ public:
     unsigned locks;
 };
 
-class RoxieMemTimingTests : public RoxieMemTests
+class RoxieMemTimingTests1 : public RoxieMemTests
 {
-    CPPUNIT_TEST_SUITE( RoxieMemTimingTests );
+    CPPUNIT_TEST_SUITE( RoxieMemTimingTests1 );
         CPPUNIT_TEST(testSetup);
         CPPUNIT_TEST(testBitmapThreading);
         CPPUNIT_TEST(testCas);
@@ -8864,8 +8864,8 @@ protected:
 
 CPPUNIT_TEST_SUITE_REGISTRATION( RoxieMemTests );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RoxieMemTests, "RoxieMemTests" );
-CPPUNIT_TEST_SUITE_REGISTRATION( RoxieMemTimingTests );
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RoxieMemTimingTests, "RoxieMemTimingTests" );
+CPPUNIT_TEST_SUITE_REGISTRATION( RoxieMemTimingTests1 );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RoxieMemTimingTests1, "RoxieMemTimingTests1" );
 CPPUNIT_TEST_SUITE_REGISTRATION( RoxieMemStressTests );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RoxieMemStressTests, "RoxieMemStressTests" );
 

testing/unittests/unittests.cpp

@@ -169,16 +169,16 @@ int main(int argc, char* argv[])
     else
         removeLog();
 
-    if (!includeNames.length())
-        includeNames.append("*");
-
-    if (!includeAll)
+    if (!includeAll && includeNames.empty())
     {
         excludeNames.append("*stress*");
         excludeNames.append("*timing*");
         excludeNames.append("*slow*");
     }
 
+    if (!includeNames.length())
+        includeNames.append("*");
+
     if (useDefaultLocations)
     {
         // Default library location depends on the executable location...