File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -172,9 +172,16 @@ bin/Test$(CONFIGURATION)/$(JAVA_INTEROP_LIB): bin/$(CONFIGURATION)/$(JAVA_INTERO
172172run-android : $(ATESTS )
173173 (cd src/Android.Interop/Tests; $( MSBUILD) $( MSBUILD_FLAGS) ' /t:Install;RunTests' $( if $( FIXTURE) ,/p:TestFixture=$( FIXTURE) ) )
174174
175- run-test-jnimarshal : bin/Test$(CONFIGURATION ) /Java.Interop.Export-Tests.dll bin/Test$(CONFIGURATION ) /$(JAVA_INTEROP_LIB )
175+ JRE_DLL_CONFIG =bin/$(CONFIGURATION ) /Java.Runtime.Environment.dll.config
176+
177+ $(JRE_DLL_CONFIG ) : src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
178+ $(MSBUILD ) $(MSBUILD_FLAGS ) $<
179+
180+ run-test-jnimarshal : bin/Test$(CONFIGURATION ) /Java.Interop.Export-Tests.dll bin/Test$(CONFIGURATION ) /$(JAVA_INTEROP_LIB ) $(JRE_DLL_CONFIG )
181+ mv -fv " $( JRE_DLL_CONFIG) " " $( JRE_DLL_CONFIG) .bak"
176182 MONO_TRACE_LISTENER=Console.Out \
177- $(RUNTIME ) bin/$(CONFIGURATION ) /jnimarshalmethod-gen.exe -v -L $(JI_MONO_LIB_PATH ) mono/4.5 -L $(JI_MONO_LIB_PATH ) mono/4.5/Facades " $<"
183+ $(RUNTIME ) bin/$(CONFIGURATION ) /jnimarshalmethod-gen.exe -v --jvm " $( JI_JVM_PATH) " -L " $( JI_MONO_LIB_PATH) mono/4.5" -L " $( JI_MONO_LIB_PATH) mono/4.5/Facades" " $<"
184+ mv -fv " $( JRE_DLL_CONFIG) .bak" " $( JRE_DLL_CONFIG) "
178185 $(call RUN_TEST,$< )
179186
180187# $(call GEN_CORE_OUTPUT, outdir, suffix, extra)
You can’t perform that action at this time.
0 commit comments