Merge pull request #3011 from rintaro/tests-target-simple-run-swiftgyb

[test] Add %target-run-simple-swiftgyb substitution

Author: gribozavr

test/1_stdlib/BridgeStorage.swift.gyb

@@ -15,9 +15,7 @@
 //  distinguish these cases efficiently.
 //
 //===----------------------------------------------------------------------===//
-// RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/out.swift
-// RUN: %line-directive %t/out.swift -- %target-build-swift -parse-stdlib %t/out.swift -o %t/a.out
-// RUN: %line-directive %t/out.swift -- %target-run %t/a.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 // REQUIRES: objc_interop

test/1_stdlib/CastTraps.swift.gyb

@@ -1,8 +1,5 @@
 // -*- swift -*-
-// RUN: rm -rf %t ; mkdir -p %t
-// RUN: %gyb %s -o %t/CastTraps.swift
-// RUN: %line-directive %t/CastTraps.swift -- %target-build-swift %t/CastTraps.swift -o %t/a.out
-// RUN: %line-directive %t/CastTraps.swift -- %target-run %t/a.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 // FIXME: Casting.cpp has dozens of places to fail a cast. This test does not 
@@ -20,26 +17,26 @@ import Foundation
 % objectTypes = []
 % protocolTypes = []
 
-% types.append(['a.Class1', 'a.Class2'])
-% objectTypes.append(['a.Class1', 'a.Class2'])
+% types.append(['main.Class1', 'main.Class2'])
+% objectTypes.append(['main.Class1', 'main.Class2'])
 class Class1 { }
 class Class2 { }
 
-% types.append(['a.Struct1', 'a.Struct2'])
+% types.append(['main.Struct1', 'main.Struct2'])
 struct Struct1 { }
 struct Struct2 { }
 
-% types.append(['a.ObjCClass1', 'a.ObjCClass2'])
-% objectTypes.append(['a.ObjCClass1', 'a.ObjCClass2'])
+% types.append(['main.ObjCClass1', 'main.ObjCClass2'])
+% objectTypes.append(['main.ObjCClass1', 'main.ObjCClass2'])
 class ObjCClass1 : NSObject { }
 class ObjCClass2 : NSObject { }
 
 % types.append(['DateFormatter', 'NumberFormatter'])
 % objectTypes.append(['DateFormatter', 'NumberFormatter'])
 // non-Swift Objective-C class
 
-% protocolTypes.append('a.Proto1')
-% protocolTypes.append('a.Proto2')
+% protocolTypes.append('main.Proto1')
+% protocolTypes.append('main.Proto2')
 protocol Proto1 { }
 protocol Proto2 { }
 % protocolTypes.append('URLSessionDelegate')

test/1_stdlib/InputStream.swift.gyb

@@ -10,10 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 // -*- swift -*-
-// RUN: rm -rf %t ; mkdir -p %t
-// RUN: %gyb %s -o %t/InputStream.swift
-// RUN: %line-directive %t/InputStream.swift -- %target-build-swift %t/InputStream.swift -o %t/a.out
-// RUN: %line-directive %t/InputStream.swift -- %target-run %t/a.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 // FIXME: The Android test runner is incapable of running this test, which

test/1_stdlib/Inputs/flatMap.gyb

@@ -1,8 +1,3 @@
-%import inspect
-%import os.path
-%import sys
-%sys.path = [os.path.split(inspect.getframeinfo(inspect.currentframe()).filename)[0] or '.'] + sys.path
-
 % for Kind in Kinds:
 %Minimal = 'Minimal' + Kind
 

test/1_stdlib/NSStringAPI.swift

@@ -1,7 +1,4 @@
-// RUN: rm -rf %t
-// RUN: mkdir -p %t
-// RUN: %target-build-swift %s -o %t/a.out
-// RUN: %target-run %t/a.out
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
 // REQUIRES: objc_interop

test/1_stdlib/StringAPI.swift

@@ -1,7 +1,4 @@
-// RUN: rm -rf %t
-// RUN: mkdir -p %t
-// RUN: %target-build-swift %s -o %t/a.out
-// RUN: %target-run %t/a.out
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
 //

test/1_stdlib/Tuple.swift.gyb

@@ -1,8 +1,4 @@
-// RUN: rm -f %t.swift %t.out
-
-// RUN: %gyb %s -o %t.swift
-// RUN: %line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
-// RUN: %line-directive %t.swift -- %target-run %t.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 import StdlibUnittest

test/1_stdlib/UnsafePointer.swift.gyb

@@ -1,6 +1,4 @@
-// RUN: rm -rf %t && mkdir -p %t && %gyb %s -o %t/UnsafePointer.swift
-// RUN: %line-directive %t/UnsafePointer.swift -- %target-build-swift %t/UnsafePointer.swift -o %t/a.out
-// RUN: %line-directive %t/UnsafePointer.swift -- %target-run %t/a.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 import StdlibUnittest

test/1_stdlib/simd.swift.gyb

@@ -1,8 +1,4 @@
-// RUN: rm -f %t.swift %t.out
-
-// RUN: %gyb %s -o %t.swift
-// RUN: %line-directive %t.swift -- %target-build-swift %t.swift -o %t.out
-// RUN: %line-directive %t.swift -- %target-run %t.out
+// RUN: %target-run-simple-swiftgyb
 // REQUIRES: executable_test
 
 // FIXME: No simd module on linux rdar://problem/20795411

test/1_stdlib/subString.swift

@@ -1,7 +1,4 @@
-// RUN: rm -rf %t
-// RUN: mkdir -p %t
-// RUN: %target-build-swift %s -o %t/a.out
-// RUN: %target-run %t/a.out
+// RUN: %target-run-simple-swift
 // REQUIRES: executable_test
 
 import StdlibUnittest