From d6f3de3c4c8639b5052ffeed483b79193fb76a07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksey=20Kliger=20=28=CE=BBgeek=29?= Date: Fri, 20 Dec 2019 05:11:26 -0500 Subject: [PATCH] [tests] Add test files to tarball (#18261) Some test sources weren't included. Fixes https://github.com/mono/mono/issues/18202 --- mono/tests/Makefile.am | 10 ++++++++++ mono/tests/assembly-load-reference/Makefile.am | 5 +++++ mono/tests/testing_gac/Makefile.am | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am index a786a16430e..8c825a057df 100755 --- a/mono/tests/Makefile.am +++ b/mono/tests/Makefile.am @@ -2798,12 +2798,18 @@ safehandle.2.exe winx64structs.exe thunks.exe pinvoke3.exe pinvoke2.exe pinvoke- marshalbool.exe marshal9.exe marshal5.exe marshal.exe handleref.exe cominterop.exe bug-Xamarin-5278.exe \ bug-58782-plain-throw.exe bug-58782-capture-and-throw.exe install_eh_callback.exe: libtest.la +EXTRA_DIST += event-il.il + event-get.2.exe$(PLATFORM_AOT_SUFFIX): event-il.exe$(PLATFORM_AOT_SUFFIX) event-get.2.exe: event-il.exe +EXTRA_DIST += module-cctor.il + module-cctor-loader.2.exe$(PLATFORM_AOT_SUFFIX): module-cctor.exe$(PLATFORM_AOT_SUFFIX) module-cctor-loader.2.exe: module-cctor.exe +EXTRA_DIST += TestingReferenceAssembly.cs TestingReferenceReferenceAssembly.cs + reference-loader.exe$(PLATFORM_AOT_SUFFIX): TestingReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX) TestingReferenceReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX) reference-loader.exe: TestingReferenceAssembly.dll TestingReferenceReferenceAssembly.dll @@ -3084,6 +3090,8 @@ TESTS_UNHANDLED_EXCEPTION_255_SRC = \ threadpool-exceptions2.cs \ threadpool-exceptions5.cs +EXTRA_DIST += $(TESTS_UNHANDLED_EXCEPTION_1_SRC) $(TESTS_UNHANDLED_EXCEPTION_255_SRC) + TESTS_UNHANDLED_EXCEPTION_1=$(filter-out $(DISABLED_TESTS),$(TESTS_UNHANDLED_EXCEPTION_1_SRC:.cs=.exe)) TESTS_UNHANDLED_EXCEPTION_255=$(filter-out $(DISABLED_TESTS),$(TESTS_UNHANDLED_EXCEPTION_255_SRC:.cs=.exe)) @@ -3159,6 +3167,8 @@ TESTS_STRESS_PROCESS_SRC= \ process-stress-3.cs \ process-leak.cs +EXTRA_DIST += $(TESTS_STRESS_PROCESS_SRC) + TESTS_STRESS_PROCESS=$(filter-out $(DISABLED_TESTS),$(TESTS_STRESS_PROCESS_SRC:.cs=.exe)) if FULL_AOT_TESTS diff --git a/mono/tests/assembly-load-reference/Makefile.am b/mono/tests/assembly-load-reference/Makefile.am index 1cdd895714b..a1b1f827a25 100644 --- a/mono/tests/assembly-load-reference/Makefile.am +++ b/mono/tests/assembly-load-reference/Makefile.am @@ -81,6 +81,11 @@ TESTS_CS = \ mainanddep/LoadFromMain.cs \ mainanddep/LoadFileMain.cs +LIBRARIES_CS = src/Dep.cs \ + src/Mid.cs + +EXTRA_DIST += $(TESTS_CS) $(LIBRARIES_CS) + TESTS_EXE = $(TESTS_CS:.cs=.exe) TESTS_EXE_AOT = $(TESTS_EXE:.exe=.exe$(PLATFORM_AOT_SUFFIX)) diff --git a/mono/tests/testing_gac/Makefile.am b/mono/tests/testing_gac/Makefile.am index ed8369be962..44f82cac49b 100644 --- a/mono/tests/testing_gac/Makefile.am +++ b/mono/tests/testing_gac/Makefile.am @@ -62,6 +62,7 @@ BASE_MONO_PATH=$(CLASS) V1_SRC= v1/gactestlib.cs V2_SRC= v2/gactestlib.cs APP_V1_SRC = v1/app.cs v1/app-refl-load.cs +APP_BOTH_SRC = app-both.cs APP_SIGNED_V1_EXE = app-v1.exe app-refl-load-v1.exe @@ -97,7 +98,7 @@ SIGN= -delaysign -keyfile:$(SIGNING_KEY) ### autotools stuff -EXTRA_DIST= README $(SIGNING_KEY) $(GACTESTLIB_SRCS) +EXTRA_DIST= README $(SIGNING_KEY) $(GACTESTLIB_SRCS) $(APP_V1_SRC) $(APP_BOTH_SRC) ### Test cases -- 2.11.4.GIT