Skip to content
Snippets Groups Projects
Commit d7c606d6 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

Various makefile fixes for the test environment.

parent 5068347b
No related branches found
No related tags found
No related merge requests found
......@@ -259,6 +259,9 @@ $(SUBDIRS:%=%/__uninstall__): dummy
check test:: $(TESTRESULTS)
$(SUBDIRS:%=%/__test__): dummy
@cd `dirname $@` && $(MAKE) test
$(PLTESTS:.c=.ok): $(WINETEST)
$(CTESTS:.c=.ok): $(TESTPROGRAM).so
......
......@@ -71,6 +71,11 @@ INSTALLSUBDIRS = \
tsx11 \
unicode
# Sub-directories to run make test into
TESTSUBDIRS = \
programs/winetest \
dlls
EMUOBJS = \
miscemu/miscemu.o
......@@ -157,9 +162,12 @@ checklink::
@cd dlls && $(MAKE) checklink
@cd debugger && $(MAKE) checklink
check test::
@cd programs/winetest && $(MAKE) test
@cd dlls && $(MAKE) test
test_environment: dummy
@cd programs/winetest && $(MAKE) all
$(TESTSUBDIRS:%=%/__test__): test_environment
check test:: $(TESTSUBDIRS:%=%/__test__)
TAGS etags:
etags `find $(TOPSRCDIR) -name '*.[chS]' -print | grep -v dbgmain`
......
......@@ -840,9 +840,6 @@ libkernel32.dll.$(LIBEXT): kernel/kernel32.dll$(DLLEXT)
# Misc rules
$(SUBDIRS:%=%/__test__): dummy
@cd `dirname $@` && $(MAKE) test
$(SUBDIRS:%=%/__checklink__): dummy
@cd `dirname $@` && $(MAKE) checklink
......
......@@ -246,9 +246,6 @@ foreach $mod (keys %linkable_dlls)
print NEWMAKE <<EOF;
# Misc rules
\$(SUBDIRS:%=%/__test__): dummy
\@cd `dirname \$\@` && \$(MAKE) test
\$(SUBDIRS:%=%/__checklink__): dummy
\@cd `dirname \$\@` && \$(MAKE) checklink
......
......@@ -32,6 +32,8 @@ RC_SRCS = \
CTESTS = tests/vartest.c
EXTRASUBDIRS = tests
@MAKE_DLL_RULES@
### Dependencies:
......
......@@ -10,6 +10,8 @@ MODULE = winetest
C_SRCS = winetest.c
EXTRA_SRCS = wtmain.c
EXTRA_OBJS = wine.o
EXTRASUBDIRS = include tests
......@@ -19,6 +21,8 @@ PLTESTS = \
@MAKE_PROG_RULES@
all: wtmain.o
wine.c: wine.xs
perl $(XSUBPPDIR)/xsubpp -typemap $(XSUBPPDIR)/typemap $(SRCDIR)/wine.xs >wine.c || $(RM) wine.c
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment