From 22b4823f9f4c7b1687f48243a40bdcf0480491b2 Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Fri, 1 Apr 2022 09:18:16 +0200
Subject: [PATCH] Fix KERNEL_UnitTests in O3 mode. TEST_SUITE in CPPUNIT does
 not respect order.

---
 src/Basics/Test/BasicMainTestOrdered.hxx | 92 ++++++++++++++++++++++++
 src/UnitTests/UnitTests.cxx              | 16 ++---
 2 files changed, 100 insertions(+), 8 deletions(-)
 create mode 100644 src/Basics/Test/BasicMainTestOrdered.hxx

diff --git a/src/Basics/Test/BasicMainTestOrdered.hxx b/src/Basics/Test/BasicMainTestOrdered.hxx
new file mode 100644
index 000000000..aec1e0bf7
--- /dev/null
+++ b/src/Basics/Test/BasicMainTestOrdered.hxx
@@ -0,0 +1,92 @@
+// Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef _BASICMAINTEST_HXX_
+#define _BASICMAINTEST_HXX_
+
+#include <cppunit/CompilerOutputter.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/TextTestProgressListener.h>
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/TestRunner.h>
+#include <stdexcept>
+
+#include <iostream>
+#include <sstream>
+#include <fstream>
+
+// ============================================================================
+/*!
+ *  Main program source for Unit Tests with cppunit package does not depend
+ *  on actual tests, so we use the same for all partial unit tests.
+ */
+// ============================================================================
+
+int main()
+{
+  // --- Create the event manager and test controller
+  CPPUNIT_NS::TestResult controller;
+
+  // ---  Add a listener that colllects test result
+  CPPUNIT_NS::TestResultCollector result;
+  controller.addListener( &result );        
+
+  // ---  Add a listener that print dots as test run.
+#ifdef WIN32
+  CPPUNIT_NS::TextTestProgressListener progress;
+#else
+  CPPUNIT_NS::BriefTestProgressListener progress;
+#endif
+  controller.addListener( &progress );      
+
+  // ---  Adds the test to the list of test to run
+
+  CPPUNIT_NS::TestRunner runner;
+  for(int ii = 0; ii<42; ++ii)
+  {
+     std::ostringstream oss; oss << ii;
+     CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry(oss.str().c_str()).makeTest();
+     runner.addTest( suite );
+  }
+  runner.run( controller);
+
+  // ---  Print test in a compiler compatible format.
+
+  std::ofstream testFile;
+  testFile.open("UnitTestsResult", std::ios::out |  std::ios::trunc);
+  //CPPUNIT_NS::CompilerOutputter outputter( &result, std::cerr );
+  CPPUNIT_NS::CompilerOutputter outputter( &result, testFile );
+  outputter.write(); 
+
+  // ---  Run the tests.
+
+  bool wasSucessful = result.wasSuccessful();
+  testFile.close();
+
+  // ---  Return error code 1 if the one of test failed.
+
+  return wasSucessful ? 0 : 1;
+}
+
+#endif
diff --git a/src/UnitTests/UnitTests.cxx b/src/UnitTests/UnitTests.cxx
index 791bcdb23..e7bb619c8 100644
--- a/src/UnitTests/UnitTests.cxx
+++ b/src/UnitTests/UnitTests.cxx
@@ -35,16 +35,16 @@
 
 // --- Registers the fixture into the 'registry'
 
-CPPUNIT_TEST_SUITE_REGISTRATION( SALOMELocalTraceTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SALOMELocalTraceTest,"0" );
 #ifdef WITH_CORBA
-CPPUNIT_TEST_SUITE_REGISTRATION( SALOMETraceCollectorTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( UtilsTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( NamingServiceTest );
-CPPUNIT_TEST_SUITE_REGISTRATION( LifeCycleCORBATest );
-CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSImplTest );
-//CPPUNIT_TEST_SUITE_REGISTRATION( SALOMEDSTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SALOMETraceCollectorTest,"1" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( UtilsTest,"2" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NamingServiceTest,"3" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( LifeCycleCORBATest,"4" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SALOMEDSImplTest,"5" );
+//CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( SALOMEDSTest, "6" );
 #endif
 
 // --- generic Main program from Basic/Test
 
-#include "BasicMainTest.hxx"
+#include "BasicMainTestOrdered.hxx"
-- 
2.39.2