From a82e9ad2423bfb8b3f0d4189ff8150083caaadff Mon Sep 17 00:00:00 2001 From: rintaro ishizaki Date: Thu, 16 Jun 2016 17:31:59 +0900 Subject: [PATCH 1/2] [lit] Show test script when '--no-execute -a' is specified to `lit.py` --- test/lit.cfg | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/lit.cfg b/test/lit.cfg index bf064ef223d8c..704a1f67d3b49 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -170,10 +170,24 @@ class SwiftTest(lit.formats.ShTest, object): def execute(self, test, litConfig): + if litConfig.noExecute: + return self.show_script(test, litConfig) self.before_test(test, litConfig) result = super(SwiftTest, self).execute(test, litConfig) return self.after_test(test, litConfig, result) + def show_script(self, test, litConfig): + script = lit.TestRunner.parseIntegratedTestScript(test, True) + if isinstance(script, lit.Test.Result): + return script + tmpDir, tmpBase = lit.TestRunner.getTempPaths(test) + substitutions = lit.TestRunner.getDefaultSubstitutions( + test, tmpDir, tmpBase, + normalize_slashes=self.execute_external) + script = lit.TestRunner.applySubstitutions(script, substitutions) + output = "Script:\n--\n%s\n--\n" % ('\n'.join(script)) + return lit.Test.Result(lit.Test.PASS, output) + # name: The name of this test suite. config.name = 'Swift(%s)' % config.variant_suffix[1:] From 7532192da97019b08803a08a91a38746a7b03efd Mon Sep 17 00:00:00 2001 From: Rintaro Ishizaki Date: Thu, 11 Aug 2016 12:27:00 +0900 Subject: [PATCH 2/2] [util] Support show-script mode in utils/run-test --- utils/run-test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/run-test b/utils/run-test index 9d49387cf4450..432285b7ff0a1 100755 --- a/utils/run-test +++ b/utils/run-test @@ -103,6 +103,8 @@ def main(): "--build-dir is specified, none otherwise)") parser.add_argument("-v", "--verbose", action="store_true", help="run test with verbose output") + parser.add_argument("-n", "--no-execute", action="store_true", + help="print test scripts, but do not execute them ") parser.add_argument("--build-dir", type=os.path.realpath, metavar="PATH", help="Swift build directory") parser.add_argument("--build", @@ -231,8 +233,10 @@ def main(): shutil.rmtree(args.result_dir) os.makedirs(args.result_dir) - if args.verbose: + if args.verbose or args.no_execute: test_args = ["-a"] + if args.no_execute: + test_args += ["--no-execute"] else: test_args = ["-sv"]