Skip to content

Commit 6e718d4

Browse files
committed
Factor FileCheck into a framework
1 parent dbbb378 commit 6e718d4

10 files changed

+20
-1459
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ matrix:
55
include:
66
- os: osx
77
language: objective-c
8-
osx_image: xcode8.3
8+
osx_image: xcode9
99
before_install:
1010
- export PATH=/usr/local/opt/llvm/bin:"${PATH}"
1111
- brew update
@@ -33,10 +33,10 @@ matrix:
3333
- sudo rm -f /usr/bin/llvm-config
3434
- sudo ln -s /usr/bin/llvm-config-${LLVM_API_VERSION} /usr/bin/llvm-config
3535
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
36-
- wget https://swift.org/builds/swift-3.1.1-release/ubuntu1404/swift-3.1.1-RELEASE/swift-3.1.1-RELEASE-ubuntu14.04.tar.gz
37-
- tar xzf swift-3.1.1-RELEASE-ubuntu14.04.tar.gz
38-
- export PATH=${PWD}/swift-3.1.1-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
39-
- sudo ./swift-3.1.1-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
36+
- wget https://swift.org/builds/swift-4.0-release/ubuntu1404/swift-4.0-RELEASE/swift-4.0-RELEASE-ubuntu14.04.tar.gz
37+
- tar xzf swift-4.0-RELEASE-ubuntu14.04.tar.gz
38+
- export PATH=${PWD}/swift-4.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
39+
- sudo ./swift-4.0-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
4040
script:
4141
- swift test
4242
notifications:

Package.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@ let package = Package(
1111
],
1212
dependencies: [
1313
.package(url: "https://github.com/trill-lang/cllvm.git", .branch("master")),
14+
.package(url: "https://github.com/trill-lang/FileCheck.git", .branch("master")),
15+
],
16+
targets: [
17+
.target(
18+
name: "LLVM"),
19+
.testTarget(
20+
name: "LLVMTests",
21+
dependencies: ["LLVM", "FileCheck"]),
1422
]
1523
)

Tests/LLVMTests/ANSIColor.swift

Lines changed: 0 additions & 40 deletions
This file was deleted.

Tests/LLVMTests/ColoredStream.swift

Lines changed: 0 additions & 79 deletions
This file was deleted.

Tests/LLVMTests/ConstantSpec.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import LLVM
22
import XCTest
3+
import FileCheck
34
import Foundation
45

56
class ConstantSpec : XCTestCase {

Tests/LLVMTests/FIleCheckSpec.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import LLVM
22
import XCTest
3+
import FileCheck
34
import Foundation
45

56
class FileCheckSpec : XCTestCase {

0 commit comments

Comments
 (0)