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.

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

Consume vendor specific exclude list #3942

Merged
merged 1 commit into from
Sep 6, 2022

Conversation

Mesbah-Alam
Copy link
Contributor

Consume vendor specific exclude list
Related : backlog/issues/885

Signed-off-by: Mesbah-Alam Mesbah_Alam@ca.ibm.com

@Mesbah-Alam
Copy link
Contributor Author

The following test shows that the dev specific exclude file is being consumed by the framework:
Grinder_JCK/627

@Mesbah-Alam Mesbah-Alam marked this pull request as ready for review August 30, 2022 20:40
@Mesbah-Alam
Copy link
Contributor Author

Note: This PR should be delivered before we deliver changes to the internal tck repos for adding *-dev.jtx.

@@ -267,6 +268,16 @@ public static boolean generateJTB() throws Exception {
System.out.println("Unable to find additional excludes list file " + jtxFullPath);
jtxFullPath = "";
}

jtxDevFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + "-dev.jtx";
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we offer the option to pass in the full path, since in temurin-compliance case we are not able to add files to jckRoot, so we would have to host the exclude file elsewhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I will add a new input variable (e.g. -customJtx) to JavasTestRunner for passing in full path to an exclude file.

Copy link
Contributor

Choose a reason for hiding this comment

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

thanks Mesbah!

Copy link
Contributor Author

@Mesbah-Alam Mesbah-Alam Aug 31, 2022

Choose a reason for hiding this comment

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

@smlambert - I have updated the PR. JavaTestRunner will now accepts a new input parameter called customJtx which can be used to supply a full (local) path to a custom jtx file. If supplied the custom jtx file will be appended to the excludeList property in the generated command (jtb) file.

Tested: Grinder_JCK/638.

(Note: The test was done using an internal machine where I pre-created a custom jtx file (/home/jenkins/mesbah/custom.jtx). It was then supplied viacustomJtx simply in CUSTOM_TARGET field (i.e. TARGET=jck_custom and CUSTOM_TARGET=api/java_beans/Beans/Beans.html customJtx=/home/jenkins/mesbah/custom.jtx).

(will share test output via slack).

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks @Mesbah-Alam, I will run a similar test on the temurin-compliance server!

Signed-off-by: Mesbah-Alam <Mesbah_Alam@ca.ibm.com>
Copy link
Contributor

@llxia llxia left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

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

thanks @Mesbah-Alam !

@smlambert smlambert merged commit 0bc510d into adoptium:master Sep 6, 2022
@Mesbah-Alam Mesbah-Alam deleted the add-support-for-jck-dev-jtx branch February 6, 2023 13:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants