resilient-test-helper: Add --no-backward-deployment flag

This is used when the application changes in an incompatible way.

Author: slavapestov

utils/rth

@@ -26,7 +26,8 @@ def verbose_print_command(command):
 
 class ResilienceTest(object):
     def __init__(self, target_build_swift, target_run, tmp_dir, test_dir,
-                 test_src, additional_compile_flags_library):
+                 test_src, additional_compile_flags_library,
+                 no_backward_deployment):
         self.target_build_swift = shlex.split(target_build_swift)
         self.target_run = shlex.split(target_run)
         self.tmp_dir = tmp_dir
@@ -44,6 +45,8 @@ class ResilienceTest(object):
         self.lib_obj_name = self.lib_src_name[:-6] + '.o'
         self.lib_src = os.path.join(self.test_dir, 'Inputs', self.lib_src_name)
 
+        self.no_backward_deployment = no_backward_deployment
+
     def run(self):
         self.set_up()
         self.compile_library()
@@ -73,44 +76,53 @@ class ResilienceTest(object):
 
     def compile_main(self):
         for config in self.config_dir_map:
-                output_obj = os.path.join(self.config_dir_map[config], 'main.o')
-                compiler_flags = ['-D', config, '-c', self.test_src, '-I',
-                                  self.config_dir_map[config], '-o', output_obj]
-                command = self.target_build_swift + compiler_flags
-                verbose_print_command(command)
-                returncode = subprocess.call(command)
-                assert returncode == 0, str(command)
-
-    def link(self):
+            output_obj = os.path.join(self.config_dir_map[config], 'main.o')
+            compiler_flags = ['-D', config, '-c', self.test_src, '-I',
+                              self.config_dir_map[config], '-o', output_obj]
+            command = self.target_build_swift + compiler_flags
+            verbose_print_command(command)
+            returncode = subprocess.call(command)
+            assert returncode == 0, str(command)
+
+    def configs(self):
         for config1 in self.config_dir_map:
             for config2 in self.config_dir_map:
-                config1_lower = config1.lower()
-                config2_lower = config2.lower()
-                output_obj = os.path.join(self.tmp_dir,
-                                          config1_lower + '_' + config2_lower)
-                compiler_flags = [
-                    os.path.join(self.config_dir_map[config1],
-                                 self.lib_obj_name),
-                    os.path.join(self.config_dir_map[config2],
-                                 'main.o'),
-                    '-o', output_obj
-                ]
-                command = self.target_build_swift + compiler_flags
-                verbose_print_command(command)
-                returncode = subprocess.call(command)
-                assert returncode == 0, str(command)
+                # --no-backward-deployment skips testing a new application
+                # linked against an old library.
+                if config1 == "BEFORE" and config2 == "AFTER" and \
+                  self.no_backward_deployment:
+                    continue
+
+                yield (config1, config2)
+
+    def link(self):
+        for config1, config2 in self.configs():
+            config1_lower = config1.lower()
+            config2_lower = config2.lower()
+            output_obj = os.path.join(self.tmp_dir,
+                                      config1_lower + '_' + config2_lower)
+            compiler_flags = [
+                os.path.join(self.config_dir_map[config1],
+                             self.lib_obj_name),
+                os.path.join(self.config_dir_map[config2],
+                             'main.o'),
+                '-o', output_obj
+            ]
+            command = self.target_build_swift + compiler_flags
+            verbose_print_command(command)
+            returncode = subprocess.call(command)
+            assert returncode == 0, str(command)
 
     def execute(self):
-        for config1 in self.config_dir_map:
-            for config2 in self.config_dir_map:
-                config1_lower = config1.lower()
-                config2_lower = config2.lower()
-                output_obj = os.path.join(self.tmp_dir,
-                                          config1_lower + '_' + config2_lower)
-                command = self.target_run + [output_obj]
-                verbose_print_command(command)
-                returncode = subprocess.call(command)
-                assert returncode == 0, str(command)
+        for config1, config2 in self.configs():
+            config1_lower = config1.lower()
+            config2_lower = config2.lower()
+            output_obj = os.path.join(self.tmp_dir,
+                                      config1_lower + '_' + config2_lower)
+            command = self.target_run + [output_obj]
+            verbose_print_command(command)
+            returncode = subprocess.call(command)
+            assert returncode == 0, str(command)
 
 def main():
     parser = argparse.ArgumentParser(description='Resilience test helper')
@@ -120,12 +132,15 @@ def main():
     parser.add_argument('--S', required=True)
     parser.add_argument('--s', required=True)
     parser.add_argument('--additional-compile-flags-library', default='')
+    parser.add_argument('--no-backward-deployment', default=False,
+                        action='store_true')
 
     args = parser.parse_args()
 
     resilience_test = ResilienceTest(args.target_build_swift, args.target_run,
                                      args.t, args.S, args.s,
-                                     args.additional_compile_flags_library)
+                                     args.additional_compile_flags_library,
+                                     args.no_backward_deployment)
 
     return resilience_test.run()