diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2009-04-09 21:52:52 +0400 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2009-04-09 21:52:52 +0400 |
| commit | 68272e87a284fd53b413eec016225042dae29d54 (patch) | |
| tree | f4a04adf3a3f2d73e61c93b87dffe9f3c1576f77 /mcs/build | |
| parent | 5b83837bcda336c0768deb9ae0365036c178107c (diff) | |
* executable.make, library.make: Move the include for tests.make so
that DISTFILES can be properly set (and thus properly distribute the
*_test.dll.sources file). This allows unit tests to actually build
and run when building from the tarball.
svn path=/trunk/mcs/; revision=131409
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/ChangeLog | 7 | ||||
| -rw-r--r-- | mcs/build/executable.make | 18 | ||||
| -rw-r--r-- | mcs/build/library.make | 13 |
3 files changed, 23 insertions, 15 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index 2d302742826..1dc148fe890 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,10 @@ +2009-04-09 Jonathan Pryor <jpryor@novell.com> + + * executable.make, library.make: Move the include for tests.make so + that DISTFILES can be properly set (and thus properly distribute the + *_test.dll.sources file). This allows unit tests to actually build + and run when building from the tarball. + 2009-04-05 Jonathan Pryor <jpryor@novell.com> * executable.make: Support HAS_NUNIT_TEST variable; if set, will build diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 61d8d2a886e..da828e3284b 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -72,6 +72,17 @@ run-test-ondotnet-local: DISTFILES = $(sourcefile) $(base_prog_config) $(EXTRA_DISTFILES) +ifdef HAS_NUNIT_TEST +ASSEMBLY = $(PROGRAM) +ASSEMBLY_EXT = .exe +the_assembly = $(PROGRAM) +include $(topdir)/build/tests.make +endif + +ifdef HAVE_CS_TESTS +DISTFILES += $(test_sourcefile) +endif + dist-local: dist-default for f in `cat $(sourcefile)` ; do \ case $$f in \ @@ -124,10 +135,3 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp doc-update-local: @: -ifdef HAS_NUNIT_TEST -ASSEMBLY = $(PROGRAM) -ASSEMBLY_EXT = .exe -the_assembly = $(PROGRAM) -include $(topdir)/build/tests.make -endif - diff --git a/mcs/build/library.make b/mcs/build/library.make index 9ec8a25a35b..e8bd0658013 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -141,12 +141,14 @@ test-local run-test-local run-test-ondotnet-local: DISTFILES = $(wildcard *$(LIBRARY)*.sources) $(EXTRA_DISTFILES) +ASSEMBLY = $(LIBRARY) +ASSEMBLY_EXT = .dll +the_assembly = $(the_lib) +include $(topdir)/build/tests.make + ifdef HAVE_CS_TESTS DISTFILES += $(test_sourcefile) endif -ifdef HAVE_VB_TESTS -DISTFILES += $(btest_sourcefile) -endif # make dist will collect files in .sources files from all profiles dist-local: dist-default @@ -259,8 +261,3 @@ $(the_libdir)/.doc-stamp: $(the_lib) $(MDOC_UP) @echo "doc-stamp" > $@ -ASSEMBLY = $(LIBRARY) -ASSEMBLY_EXT = .dll -the_assembly = $(the_lib) -include $(topdir)/build/tests.make - |