Skip to content
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

Jump to bottom

Rationalise test suite classes. #1177

Merged
merged 1 commit into from
Oct 24, 2023
Merged

Rationalise test suite classes. #1177

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
137 changes: 0 additions & 137 deletions common/src/test/java/org/conscrypt/ConscryptJava7Suite.java
View file
Open in desktop

This file was deleted.

167 changes: 0 additions & 167 deletions common/src/test/java/org/conscrypt/ConscryptSuite.java
View file
Open in desktop

This file was deleted.

20 changes: 2 additions & 18 deletions openjdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,28 +315,12 @@ def addNativeJar(NativeBuildInfo nativeBuild) {
publishing.publications.maven.artifact jarTask.get()
}


// TODO(prb) Still provide a mechanism for testing on Java 7?
// Check which version
//def javaError = new ByteArrayOutputStream()
//exec {
// executable test.executable
// System.out.println("Running tests with java executable: " + test.executable + ".")
// args = ['-version']
// ignoreExitValue true
// errorOutput = javaError
//}
//
//def suiteClass = (javaError.toString() =~ /"1[.]7[.].*"/) ?
// "org/conscrypt/ConscryptJava7Suite.class" : "org/conscrypt/ConscryptSuite.class";
def suiteClass = "org/conscrypt/ConscryptSuite.class";

test {
include suiteClass, "org/conscrypt/ConscryptOpenJdkSuite.class"
include "org/conscrypt/ConscryptOpenJdkSuite.class"
}

def testFdSocket = tasks.register("testFdSocket", Test) {
include suiteClass, "org/conscrypt/ConscryptOpenJdkSuite.class"
include "org/conscrypt/ConscryptOpenJdkSuite.class"
InvokerHelper.setProperties(testLogging, test.testLogging.properties)
systemProperties = test.systemProperties
systemProperty "org.conscrypt.useEngineSocketByDefault", false
Expand Down
Loading
Loading