--- a/hotspot/make/bsd/makefiles/jsig.make Thu Oct 01 13:43:23 2015 -0700
+++ b/hotspot/make/bsd/makefiles/jsig.make Fri Oct 02 11:58:41 2015 +0000
@@ -62,7 +62,7 @@
$(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) $@
--- a/hotspot/test/serviceability/logging/TestBasicLogOutput.java Thu Oct 01 13:43:23 2015 -0700
+++ b/hotspot/test/serviceability/logging/TestBasicLogOutput.java Fri Oct 02 11:58:41 2015 +0000
@@ -35,7 +35,7 @@
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);
}