Synchronise with http://git.erp5.org/gitweb/erp5.git

slapos/recipe/erp5/test_suite_runner.py

@@ -8,4 +8,16 @@ def runTestSuite(args):
   env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
   env['INSTANCE_HOME'] = d['instance_home']
   env['REAL_INSTANCE_HOME'] = d['instance_home']
-  os.execve(d['call_list'][0], d['call_list'] + sys.argv[1:], env)
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5/testrunner.py

@@ -8,4 +8,16 @@ def runUnitTest(args):
   env['PATH'] = ':'.join([d['prepend_path']] + os.environ['PATH'].split(':'))
   env['INSTANCE_HOME'] = d['instance_home']
   env['REAL_INSTANCE_HOME'] = d['instance_home']
-  os.execve(d['call_list'][0], d['call_list'] + sys.argv[1:], env)
+  # Deal with Shebang size limitation
+  executable_filepath = d['call_list'][0]
+  file_object = open(executable_filepath, 'r')
+  line = file_object.readline()
+  file_object.close()
+  argument_list = []
+  if line[:2] == '#!':
+    executable_filepath = line[2:].strip()
+    argument_list.append(executable_filepath)
+  argument_list.extend(d['call_list'])
+  argument_list.extend(sys.argv[1:])
+  argument_list.append(env)
+  os.execle(executable_filepath, *argument_list)

slapos/recipe/erp5testnode/testnode.py

@@ -198,12 +198,19 @@ repository = %(repository_path)s
           run_test_suite_revision = revision
           if isinstance(revision, tuple):
             revision = ','.join(revision)
-          run_test_suite = subprocess.Popen([run_test_suite_path,
-                          '--test_suite', config['test_suite_name'],
-                          '--revision', revision,
-                          '--node_quantity', config['node_quantity'],
-                          '--master_url', config['test_suite_master_url'],
-                          ], )
+          # Deal with Shebang size limitation
+          file_object = open(run_test_suite_path, 'r')
+          line = file_object.readline()
+          file_object.close()
+          invocation_list = []
+          if line[:2] == '#!':
+            invocation_list = line[2:].split()
+          invocation_list.extend([run_test_suite_path,
+                                  '--test_suite', config['test_suite_name'],
+                                  '--revision', revision,
+                                  '--node_quantity', config['node_quantity'],
+                                  '--master_url', config['test_suite_master_url']])
+          run_test_suite = subprocess.Popen(invocation_list)
           process_group_pid_set.add(run_test_suite.pid)
           run_test_suite.wait()
           process_group_pid_set.remove(run_test_suite.pid)