From 722a59d335ed1002cd869f661de5f6202d40d1c1 Mon Sep 17 00:00:00 2001 From: Jordan Rose Date: Wed, 6 Jul 2016 10:08:40 -0700 Subject: [PATCH] [test] Avoid xcrun in this particular test. (#3351) It seems to be messing with environment variables. rdar://problem/26981561 (cherry picked from commit 2478993701c14a8efe497f030babf5553b2700d4) --- test/Driver/temp-files.swift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Driver/temp-files.swift b/test/Driver/temp-files.swift index d9ffabcd3df84..f41f7005bd563 100644 --- a/test/Driver/temp-files.swift +++ b/test/Driver/temp-files.swift @@ -9,18 +9,18 @@ // EMPTY-NOT: .{{(o|swiftmodule|swiftdoc)}} // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy -// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main2 -emit-module-path %t/main2.swiftmodule +// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main2 -emit-module-path %t/main2.swiftmodule // RUN: ls %t/main2 // RUN: ls %t/main2.swiftmodule // RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy -// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main3 -g +// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main3 -g // RUN: ls %t/main3 // RUN: ls %t/tmp | FileCheck -check-prefix=EMPTY %s // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy -// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main4 -emit-module-path %t/main4.swiftmodule -g +// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main4 -emit-module-path %t/main4.swiftmodule -g // RUN: ls %t/main4 // RUN: ls %t/main4.swiftmodule // RUN: ls %t | FileCheck -check-prefix=MAIN4-%target-object-format %s @@ -31,7 +31,7 @@ // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy // RUN: echo "{\"%s\": {\"object\": \"%t/main5.o\"}}" > %t.json -// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main5 -output-file-map %t.json -g +// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main5 -output-file-map %t.json -g // RUN: ls %t/main5 // RUN: ls %t/main5.o // RUN: ls %t | FileCheck -check-prefix=MAIN5-%target-object-format %s @@ -41,7 +41,7 @@ // MAIN5-elf-NOT: .dSYM // RUN: rm -rf %t && mkdir -p %t/tmp/ && touch %t/tmp/dummy -// RUN: env TMPDIR=%t/tmp/ %target-swiftc_driver -emit-executable %s -o %t/main6 -g -save-temps +// RUN: env TMPDIR=%t/tmp/ %swiftc_driver -target %target-triple -sdk %sdk -module-cache-path %t -emit-executable %s -o %t/main6 -g -save-temps // RUN: ls %t/main6 // RUN: ls %t | FileCheck -check-prefix=MAIN6-%target-object-format %s // RUN: ls %t/tmp | FileCheck -check-prefix=SAVE-TEMPS %s