From 8e010a0c32122f2160aadb38ebc94287ded21d94 Mon Sep 17 00:00:00 2001 From: Rachel Protacio Date: Thu, 1 Oct 2015 15:14:15 -0400 Subject: [PATCH 1/2] 8138574: [TESTBUG] TestBasicLogOutput.java doesn't account for padding TestBasicLogOutput.java edited to account for padding in tag descriptors Reviewed-by: ddmitriev, hseigel, coleenp --- hotspot/test/serviceability/logging/TestBasicLogOutput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/test/serviceability/logging/TestBasicLogOutput.java b/hotspot/test/serviceability/logging/TestBasicLogOutput.java index 7e30b7e7bf2..c74a258f278 100644 --- a/hotspot/test/serviceability/logging/TestBasicLogOutput.java +++ b/hotspot/test/serviceability/logging/TestBasicLogOutput.java @@ -35,7 +35,7 @@ public class TestBasicLogOutput { public static void main(String[] args) throws Exception { ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:all=trace", "-version"); OutputAnalyzer output = new OutputAnalyzer(pb.start()); - output.shouldContain("[logging]"); // expected tag(s) + output.shouldMatch("\\[logging *\\]"); // expected tag(s) output.shouldContain("Log configuration fully initialized."); // expected message output.shouldHaveExitValue(0); } From cc93462eb513b15700f7a12f0d7a7f3dc29bb285 Mon Sep 17 00:00:00 2001 From: Erik Joelsson Date: Fri, 2 Oct 2015 10:15:46 +0200 Subject: [PATCH 2/2] 8138692: libjsig compilation is missing EXTRA_CFLAGS on macosx Reviewed-by: ihse, mikael --- hotspot/make/bsd/makefiles/jsig.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/make/bsd/makefiles/jsig.make b/hotspot/make/bsd/makefiles/jsig.make index 8c0c1b8a5e5..6a9cebbb337 100644 --- a/hotspot/make/bsd/makefiles/jsig.make +++ b/hotspot/make/bsd/makefiles/jsig.make @@ -62,7 +62,7 @@ endif $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) @echo $(LOG_INFO) Making signal interposition lib... $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ - $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< + $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $< ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ifeq ($(OS_VENDOR), Darwin) $(DSYMUTIL) $@