[build] Update runtime test tools to use correct path

diff --git a/mcs/Makefile b/mcs/Makefile
index cba9589ad08d552fdca27fd2849943b596a1738c..a3e4132385fb5ad84379b6bc9b95f6e88f985997 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -5,7 +5,7 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs packages
 # Resgen is corlib specific tool
 
 basic_SUBDIRS := build jay class
-build_SUBDIRS := build class class/aot-compiler tools
+build_SUBDIRS := build class class/aot-compiler tools ilasm
 monodroid_SUBDIRS := build class
 monotouch_SUBDIRS := build class
 monotouch_watch_SUBDIRS := build class

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 33c8b27cb0b0c3f8e006effa4263375ec6a76dff..ba4de5ede59d24e92de27dc9a2b9f940e692d730 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -32,6 +32,8 @@ build_SUBDIRS :=  \
        System.Xml.Linq \
        System.Runtime.InteropServices.RuntimeInformation \
        Mono.Cecil \
+       Mono.CompilerServices.SymbolWriter      \
+       PEAPI \
        ../tools/cil-stringreplacer
 
 -include ../build/config.make
@@ -85,13 +87,11 @@ mobile_common_dirs := \
 
 testing_aot_full_dirs := \
        $(mobile_common_dirs)   \
-       Mono.CompilerServices.SymbolWriter      \
        Mono.Simd                       \
        $(pcl_facade_dirs)
 
 testing_aot_hybrid_dirs := \
        $(mobile_common_dirs)   \
-       Mono.CompilerServices.SymbolWriter      \
        Mono.Simd                       \
        $(pcl_facade_dirs)
 

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index 7e75e4f2d2936748366f83ace426e67db059c636..547d433bcbda6b7f9b4e5df8ab33c740da89fbde 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -41,6 +41,7 @@ CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
 with_mono_path = MONO_PATH=$(CLASS)
 
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
+TOOLS_RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/build $(top_builddir)/runtime/mono-wrapper
 
 MKBUNDLE = \
        PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
@@ -54,7 +55,7 @@ if INSTALL_TESTING_AOT_HYBRID
 PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY 
 endif
 
-MCS_NO_LIB = $(RUNTIME) $(CSC) -unsafe -debug:portable \
+MCS_NO_LIB = $(TOOLS_RUNTIME) $(CSC) -unsafe -debug:portable \
        -noconfig -nologo \
        -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 \
        -nowarn:0169 -nowarn:1690 -nowarn:0649 -nowarn:0612 -nowarn:3021 \
@@ -62,7 +63,7 @@ MCS_NO_LIB = $(RUNTIME) $(CSC) -unsafe -debug:portable \
 
 MCS = $(MCS_NO_LIB) -lib:$(CLASS)
 
-ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
+ILASM = $(TOOLS_RUNTIME) $(mcs_topdir)/class/lib/build/ilasm.exe
 
 if INSTALL_TESTING_AOT_FULL
 TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)" --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)"

diff --git a/mono/tests/assemblyresolve/Makefile.am b/mono/tests/assemblyresolve/Makefile.am
index 7cf52bca24f3160c476cf44e940c7948bdf02a3f..12379c115f22ab5495ff9b5250bc9d8d795ccfe0 100644 (file)
--- a/mono/tests/assemblyresolve/Makefile.am
+++ b/mono/tests/assemblyresolve/Makefile.am
@@ -1,9 +1,6 @@
-CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
-
-with_mono_path = MONO_PATH=$(CLASS)
 
 RUNTIME = $(top_builddir)/runtime/mono-wrapper --debug
-MCS = $(with_mono_path) $(RUNTIME) $(CSC) -noconfig -nologo -debug:portable -target:library
+MCS = MONO_PATH=$(mcs_topdir)/class/lib/build $(RUNTIME) $(CSC) -noconfig -nologo -debug:portable -target:library
 
 if INSTALL_TESTING_AOT_FULL
 prereq: aot