Restore registering CORBA objects, removed by previous wrong commit

[modules/kernel.git] / bin / appli_gen.py

diff --git a/bin/appli_gen.py b/bin/appli_gen.py
index b263cd3e79646495550d8c17e7f58424dd216d09..4c64c7a79b8a234254d55d6ee4ba961521a7ad48 100644 (file)
--- a/bin/appli_gen.py
+++ b/bin/appli_gen.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  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
@@ -194,6 +194,13 @@ def install(prefix, config_file, verbose=0):
             print cle, val
             pass
 
+    # Remove CTestTestfile.cmake; this file will be filled by successive calls to link_module and link_extra_test
+    try:
+      ctest_file = os.path.join(home_dir, 'bin', 'salome', 'test', "CTestTestfile.cmake")
+      os.remove(ctest_file)
+    except:
+      pass
+
     for module in _config.get("modules", []):
         if _config.has_key(module):
             print "--- add module ", module, _config[module]
@@ -220,16 +227,18 @@ def install(prefix, config_file, verbose=0):
             pass
         pass
 
+    # Generate CTestCustom.cmake to handle long output
+    ctest_custom = os.path.join(home_dir, 'bin', 'salome', 'test', "CTestCustom.cmake")
+    with open(ctest_custom, 'w') as f:
+      f.write("SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1048576) # 1MB\n")
+      f.write("SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 1048576) # 1MB\n")
+
     appliskel_dir = os.path.join(home_dir, 'bin', 'salome', 'appliskel')
 
     for fn in ('envd',
                'getAppliPath.py',
                'kill_remote_containers.py',
-               'runAppli',           # OBSOLETE (replaced by salome)
-               'runConsole',         # OBSOLETE (replaced by salome)
                'runRemote.sh',
-               'runSalomeScript',    # OBSOLETE (replaced by salome)
-               'runSession',         # OBSOLETE (replaced by salome)
                'salome',
                'update_catalogs.py',
                '.bashrc',