Re: RFR(xs) 8221621 FindTests.gmk cannot handle "=" in TEST.groups comments
Hi Erik and David, Thanks for the review. I did a tier-1 run and all passed, so I pushed the changes. - Ioi On 3/28/19 6:50 PM, David Holmes wrote: +1 Thanks, David On 29/03/2019 6:20 am, Erik Joelsson wrote: Looks good. Thanks for fixing this! /Erik On 2019-03-28 10:04, Ioi Lam wrote: https://bugs.openjdk.java.net/browse/JDK-8221621 The function FindJtregGroupsBody needs to filter out lines that starts with "#". == diff -r 7d5a4a48e876 make/common/FindTests.gmk --- a/make/common/FindTests.gmk Wed Mar 27 14:40:36 2019 -0700 +++ b/make/common/FindTests.gmk Thu Mar 28 09:59:19 2019 -0700 @@ -53,6 +53,7 @@ -e 's/^groups\w*=//p' $1/TEST.ROOT) $1_JTREG_GROUP_FILES := $$(addprefix $1/, $$($1_JTREG_GROUP_FILENAMES)) $1_JTREG_TEST_GROUPS := $$(strip $$(shell $$(SED) -n \ + -e 's/^\#.*//g' \ -e 's/\([^ ]*\)\w*=.*/\1/gp' $$(wildcard $$($1_JTREG_GROUP_FILES)) \ | $$(SORT) -u)) endif == As a sanity check, I tested by adding $(error ${JTREG_TEST_GROUPS}) in this file to print out the groups that are found (on a clean repo without any "=" in comments). The output is identical with or without my change Thanks - Ioi
Re: RFR(xs) 8221621 FindTests.gmk cannot handle "=" in TEST.groups comments
+1 Thanks, David On 29/03/2019 6:20 am, Erik Joelsson wrote: Looks good. Thanks for fixing this! /Erik On 2019-03-28 10:04, Ioi Lam wrote: https://bugs.openjdk.java.net/browse/JDK-8221621 The function FindJtregGroupsBody needs to filter out lines that starts with "#". == diff -r 7d5a4a48e876 make/common/FindTests.gmk --- a/make/common/FindTests.gmk Wed Mar 27 14:40:36 2019 -0700 +++ b/make/common/FindTests.gmk Thu Mar 28 09:59:19 2019 -0700 @@ -53,6 +53,7 @@ -e 's/^groups\w*=//p' $1/TEST.ROOT) $1_JTREG_GROUP_FILES := $$(addprefix $1/, $$($1_JTREG_GROUP_FILENAMES)) $1_JTREG_TEST_GROUPS := $$(strip $$(shell $$(SED) -n \ + -e 's/^\#.*//g' \ -e 's/\([^ ]*\)\w*=.*/\1/gp' $$(wildcard $$($1_JTREG_GROUP_FILES)) \ | $$(SORT) -u)) endif == As a sanity check, I tested by adding $(error ${JTREG_TEST_GROUPS}) in this file to print out the groups that are found (on a clean repo without any "=" in comments). The output is identical with or without my change Thanks - Ioi
Re: RFR(xs) 8221621 FindTests.gmk cannot handle "=" in TEST.groups comments
Looks good. Thanks for fixing this! /Erik On 2019-03-28 10:04, Ioi Lam wrote: https://bugs.openjdk.java.net/browse/JDK-8221621 The function FindJtregGroupsBody needs to filter out lines that starts with "#". == diff -r 7d5a4a48e876 make/common/FindTests.gmk --- a/make/common/FindTests.gmk Wed Mar 27 14:40:36 2019 -0700 +++ b/make/common/FindTests.gmk Thu Mar 28 09:59:19 2019 -0700 @@ -53,6 +53,7 @@ -e 's/^groups\w*=//p' $1/TEST.ROOT) $1_JTREG_GROUP_FILES := $$(addprefix $1/, $$($1_JTREG_GROUP_FILENAMES)) $1_JTREG_TEST_GROUPS := $$(strip $$(shell $$(SED) -n \ + -e 's/^\#.*//g' \ -e 's/\([^ ]*\)\w*=.*/\1/gp' $$(wildcard $$($1_JTREG_GROUP_FILES)) \ | $$(SORT) -u)) endif == As a sanity check, I tested by adding $(error ${JTREG_TEST_GROUPS}) in this file to print out the groups that are found (on a clean repo without any "=" in comments). The output is identical with or without my change Thanks - Ioi
RFR(xs) 8221621 FindTests.gmk cannot handle "=" in TEST.groups comments
https://bugs.openjdk.java.net/browse/JDK-8221621 The function FindJtregGroupsBody needs to filter out lines that starts with "#". == diff -r 7d5a4a48e876 make/common/FindTests.gmk --- a/make/common/FindTests.gmk Wed Mar 27 14:40:36 2019 -0700 +++ b/make/common/FindTests.gmk Thu Mar 28 09:59:19 2019 -0700 @@ -53,6 +53,7 @@ -e 's/^groups\w*=//p' $1/TEST.ROOT) $1_JTREG_GROUP_FILES := $$(addprefix $1/, $$($1_JTREG_GROUP_FILENAMES)) $1_JTREG_TEST_GROUPS := $$(strip $$(shell $$(SED) -n \ + -e 's/^\#.*//g' \ -e 's/\([^ ]*\)\w*=.*/\1/gp' $$(wildcard $$($1_JTREG_GROUP_FILES)) \ | $$(SORT) -u)) endif == As a sanity check, I tested by adding $(error ${JTREG_TEST_GROUPS}) in this file to print out the groups that are found (on a clean repo without any "=" in comments). The output is identical with or without my change Thanks - Ioi