Merge pull request #1659 from alexanderkyte/stringbuilder-referencesource

[mono.git] / mcs / tools / mono-symbolicate / Makefile

diff --git a/mcs/tools/mono-symbolicate/Makefile b/mcs/tools/mono-symbolicate/Makefile
index 2fc45fefd3a50fd56aa10a76e3acc419181e8c82..7e14ab8a62fe7e42a917c0be74fd0e5417a5c793 100644 (file)
--- a/mcs/tools/mono-symbolicate/Makefile
+++ b/mcs/tools/mono-symbolicate/Makefile
@@ -13,7 +13,7 @@ include ../../build/executable.make
 
 LIB_PATH = $(topdir)/class/lib/$(PROFILE)
 
-MONO = MONO_PATH=$(LIB_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH $(RUNTIME)
+MONO = MONO_PATH=$(LIB_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH $(RUNTIME) -O=-inline
 
 OUT_DIR = Test/out
 TEST_CS = Test/StackTraceDumper.cs
@@ -22,14 +22,10 @@ RELEASE_FILE = $(OUT_DIR)/release.out
 SYMBOLICATE_FILE = $(OUT_DIR)/symbolicate.out
 SYMBOLICATE_EXPECTED_FILE = Test/symbolicate.expected
 
-build-test:
-       @mkdir -p $(OUT_DIR)
-       @$(MCS) -debug $(TEST_CS) -out:$(TEST_EXE)
-
-check: all build-test
-       @MONO_DEBUG=gen-compact-seq-points $(MONO) $(TEST_EXE) > $(RELEASE_FILE)
-       @$(MONO) $(LIB_PATH)/symbolicate.exe $(TEST_EXE) $(RELEASE_FILE) | sed "s/\[.*Test\//in /" > $(SYMBOLICATE_FILE)
-       @DIFF=$$(diff $(SYMBOLICATE_FILE) $(SYMBOLICATE_EXPECTED_FILE)); \
+CHECK_DIFF = @\
+       MONO_DEBUG=gen-compact-seq-points $(MONO) $(TEST_EXE) > $(RELEASE_FILE); \
+       $(MONO) $(LIB_PATH)/$(PROGRAM) $(TEST_EXE) $(RELEASE_FILE) | sed "s/).*Test\//) in /" > $(SYMBOLICATE_FILE); \
+       DIFF=$$(diff $(SYMBOLICATE_FILE) $(SYMBOLICATE_EXPECTED_FILE)); \
        if [ ! -z "$$DIFF" ]; then \
                echo "Symbolicate tests failed."; \
                echo "If $(SYMBOLICATE_FILE) is correct copy it to $(SYMBOLICATE_EXPECTED_FILE)."; \
@@ -37,3 +33,20 @@ check: all build-test
                echo "$$DIFF"; \
                exit 1; \
        fi
+
+BUILD_TEST_EXE = @\
+       rm -rf $(OUT_DIR); \
+       mkdir -p $(OUT_DIR); \
+       $(MCS) -debug $(TEST_CS) -out:$(TEST_EXE)
+
+check: all
+       $(BUILD_TEST_EXE)
+       @echo "Checking $(PROGRAM) without AOT"
+       $(CHECK_DIFF)
+       @echo "Checking $(PROGRAM) with AOT"
+       @MONO_DEBUG=gen-compact-seq-points $(MONO) --aot $(TEST_EXE) > /dev/null
+       $(CHECK_DIFF)
+       @echo "Checking $(PROGRAM) with AOT (using .msym)"
+       $(BUILD_TEST_EXE)
+       @MONO_DEBUG=gen-compact-seq-points $(MONO) --aot=gen-seq-points-file $(TEST_EXE) > /dev/null
+       $(CHECK_DIFF)