Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[corlib] Fix building nunit-lite twice #16894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akoeplinger merged 1 commit into from
Sep 17, 2019
Merged

[corlib] Fix building nunit-lite twice #16894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions mcs/build/tests.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ $(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi

$(topdir)/build/deps/nunit-$(PROFILE).stamp:
cd ${topdir}/tools/nunit-lite && $(MAKE)
$(MAKE) -C ${topdir}/tools/nunit-lite
echo "stamp" >$@

tests_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
Expand Down Expand Up @@ -378,5 +378,3 @@ $(xtest_makefrag): $(xtest_response)

endif


.PHONY: patch-nunitlite-appconfig
9 changes: 3 additions & 6 deletions mcs/class/corlib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE)
satellite_assembly1 = $(test_lib_dir)/es-ES/$(patsubst %.dll,%.resources.dll,$(test_lib))
satellite_assembly2 = $(test_lib_dir)/nn-NO/$(patsubst %.dll,%.resources.dll,$(test_lib))

$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) $(test_lib_dir)
$(test_lib_output): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) | $(test_lib_dir)

mscorlib_for_profile = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll

Expand Down Expand Up @@ -298,11 +298,8 @@ NO_VTS_TEST = yes
endif

ifndef NO_VTS_TEST
test: test-vts
run-test: run-test-vts
else
test:
run-test:
test-local: test-vts
run-test-local: run-test-vts
Copy link
Member Author

@akoeplinger akoeplinger Sep 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the important change, the other changes are just for consistency/cosmetic.

endif

EXTRA_DISTFILES += \
Expand Down
2 changes: 2 additions & 0 deletions mcs/tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ monotouch_tv_SUBDIRS = nunit-lite
monotouch_watch_SUBDIRS = nunit-lite
monotouch_tools_SUBDIRS =
monotouch_tools_PARALLEL_SUBDIRS = corcompare mono-api-html
xammac_SUBDIRS = nunit-lite
xammac_net_4_5_SUBDIRS = nunit-lite
net_4_x_SUBDIRS =
net_4_x_PARALLEL_SUBDIRS = $(net_4_5_dirs)
wasm_tools_SUBDIRS =
Expand Down