Merge pull request #1 from john-mueller/enable-test-discovery

Use test discovery on Linux

Author: john-mueller

Makefile

@@ -1,28 +1,23 @@
 export SHELL := /bin/bash
 
-.PHONY: test bench test-correctness test-performance test-thread-safety generate-linuxmain publish
+.PHONY: test bench test-correctness test-performance test-thread-safety publish
 
 test: test-correctness test-thread-safety
 
 bench: test-performance
 
 test-correctness:
-	HYPHENATION_TEST_TYPE=hyphenation swift test -c debug
+	HYPHENATION_TEST_TYPE=hyphenation swift test -c debug --enable-test-discovery
 
 test-performance:
-	rm benchmark.txt
-	HYPHENATION_TEST_TYPE=performance swift test -c release > >(tee -a benchmark.txt) 2> >(tee -a benchmark.txt >&2)
+	echo "" > benchmark.txt
+	HYPHENATION_TEST_TYPE=performance swift test -c release --enable-test-discovery > >(tee -a benchmark.txt) 2> >(tee -a benchmark.txt >&2)
 	grep -oE 'test.+?average: [0-9]+\.[0-9]+' benchmark.txt | sed -E "s/]?'.+av/ av/g"
 
 test-thread-safety:
-	HYPHENATION_TEST_TYPE=thread-safety swift test -c debug --sanitize=thread
+	HYPHENATION_TEST_TYPE=thread-safety swift test -c debug --sanitize=thread --enable-test-discovery
 
-generate-linuxmain:
-	HYPHENATION_TEST_TYPE=hyphenation swift test --generate-linuxmain
-	HYPHENATION_TEST_TYPE=preformance swift test --generate-linuxmain
-	HYPHENATION_TEST_TYPE=thread-safety swift test --generate-linuxmain
-
-publish: generate-linuxmain test
+publish: test
 	rm -rf .docs
 	jazzy
 	cp img/* .docs/img/

Tests/HyphenationTests/XCTestManifests.swift

@@ -1,8 +1,8 @@
-import XCTest
+// Hyphenation
+// © 2020 John Mueller
+// MIT license, see LICENSE.md for details
 
-import HyphenationTests
+import Foundation
 
-var tests = [XCTestCaseEntry]()
-tests += HyphenationTests.__allTests()
-
-XCTMain(tests)
+fputs("To run tests on Linux, use 'swift test --enable-test-discovery'\n", stderr)
+exit(1)