Skip to content

Update tests to support more types of SwiftPM build messages #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2019
Merged

Update tests to support more types of SwiftPM build messages #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion swift-package-init-exec.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN: %{FileCheck} --check-prefix CHECK-BUILD-LOG --input-file %t.build-log %s
```

```
CHECK-BUILD-LOG: Compiling Swift Module 'Project'
CHECK-BUILD-LOG: Compiling {{.*}}Project{{.*}}
CHECK-BUILD-LOG: Linking {{.*}}Project
```

Expand Down
4 changes: 2 additions & 2 deletions swift-package-init-lib.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN: %{FileCheck} --check-prefix CHECK-BUILD-LOG --input-file %t.build-log %s
```

```
CHECK-BUILD-LOG: Compiling Swift Module 'Project'
CHECK-BUILD-LOG: Compiling {{.*}}Project{{.*}}
```

## Check the test log.
Expand All @@ -28,7 +28,7 @@ RUN: %{FileCheck} --check-prefix CHECK-TEST-LOG --input-file %t.test-log %s
```

```
CHECK-TEST-LOG: Compiling Swift Module 'ProjectTests'
CHECK-TEST-LOG: Compiling {{.*}}ProjectTests{{.*}}
CHECK-TEST-LOG: Test Suite 'All tests' passed
CHECK-TEST-LOG-NEXT: Executed 1 test
```
Expand Down
2 changes: 1 addition & 1 deletion swift-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN: %{FileCheck} --check-prefix CHECK-BUILD-LOG --input-file %t.run-log %s
```

```
CHECK-BUILD-LOG: Compiling Swift Module 'secho'
CHECK-BUILD-LOG: Compiling {{.*}}secho{{.*}}
CHECK-BUILD-LOG: Linking {{.*}}secho
CHECK-BUILD-LOG: 1 two
```
2 changes: 1 addition & 1 deletion test-codecov-package/test-codecov-package.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// RUN: rm -rf %t.dir
// RUN: mkdir -p %t.dir
// RUN: cp -r %S/foo %t.dir/
// RUN: %{swift-test} --package-path %t.dir/foo --enable-code-coverage -v 2>&1 | tee %t.build-log
// RUN: %{swift} test --package-path %t.dir/foo --enable-code-coverage -v 2>&1 | tee %t.build-log
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line is a revert from the previous PR: this specific test can't work correctly against a custom SwiftPM binary because it expects to find code coverage information in the same folder. It basically only works with a toolchain.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, feel free to test and merge this!

//
// Check the build log.
//
Expand Down