Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle quoted empty keyword string ihse-runtestprebuilt-branch
authorerikj
Fri, 05 Oct 2018 15:15:56 -0700
branchihse-runtestprebuilt-branch
changeset 56937 3c92ada330a9
parent 56932 7346896cdea2
child 56938 e03e5f61c53f
Handle quoted empty keyword string
make/RunTests.gmk file | annotate | diff | comparison | revisions 
--- a/make/RunTests.gmk	Fri Oct 05 11:08:45 2018 -0700
+++ b/make/RunTests.gmk	Fri Oct 05 15:15:56 2018 -0700
@@ -587,8 +587,11 @@
     # The keywords string may contain problematic characters and may be quoted
     # already when it arrives here. Remove any existing quotes and replace them
     # with one set of single quotes.
-    $1_JTREG_BASIC_OPTIONS += \
-        -k:'$$(patsubst $$(SQUOTE)%$$(SQUOTE),%,$$(patsubst $$(DQUOTE)%$$(DQUOTE),%,$$(JTREG_KEYWORDS)))'
+    $1_JTREG_KEYWORDS := \
+        $$(strip $$(patsubst $$(SQUOTE)%$$(SQUOTE),%,$$(patsubst $$(DQUOTE)%$$(DQUOTE),%,$$(JTREG_KEYWORDS))))
+    ifneq ($$($1_JTREG_KEYWORDS), )
+      $1_JTREG_BASIC_OPTIONS += -k:'$$($1_JTREG_KEYWORDS)'
+    endif
   endif
 
   clean-workdir-$1:
jdk-sandbox