Commit abfcb8bf authored by Alexandre Julliard's avatar Alexandre Julliard

Added make check target to run unit tests too since this seems to be

standard.
parent 60502143
...@@ -141,7 +141,7 @@ LINTS = $(C_SRCS:.c=.ln) ...@@ -141,7 +141,7 @@ LINTS = $(C_SRCS:.c=.ln)
.pl.ok: .pl.ok:
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
.PHONY: all install uninstall clean distclean depend dummy test testclean .PHONY: all install uninstall clean distclean depend dummy check test testclean
# 'all' target first in case the enclosing Makefile didn't define any target # 'all' target first in case the enclosing Makefile didn't define any target
...@@ -242,7 +242,7 @@ testclean:: $(SUBDIRS:%=%/__testclean__) ...@@ -242,7 +242,7 @@ testclean:: $(SUBDIRS:%=%/__testclean__)
$(RM) $(TESTRESULTS) $(RM) $(TESTRESULTS)
clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
$(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(TESTRESULTS) $(PROGRAMS) $(RM) $(CLEAN_FILES) $(GEN_C_SRCS) $(GEN_ASM_SRCS) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) $(MC_SRCS:.mc=.mc.rc) $(TESTRESULTS) $(TESTLIST) $(PROGRAMS)
# Rules for installing # Rules for installing
...@@ -254,7 +254,7 @@ $(SUBDIRS:%=%/__uninstall__): dummy ...@@ -254,7 +254,7 @@ $(SUBDIRS:%=%/__uninstall__): dummy
# Rules for testing # Rules for testing
test:: $(TESTRESULTS) check test:: $(TESTRESULTS)
$(PLTESTS:.c=.ok): $(WINETEST) $(PLTESTS:.c=.ok): $(WINETEST)
$(CTESTS:.c=.ok): $(TESTPROGRAM).so $(CTESTS:.c=.ok): $(TESTPROGRAM).so
......
...@@ -134,7 +134,7 @@ checklink:: ...@@ -134,7 +134,7 @@ checklink::
@cd dlls && $(MAKE) checklink @cd dlls && $(MAKE) checklink
@cd debugger && $(MAKE) checklink @cd debugger && $(MAKE) checklink
test:: check test::
@cd programs/winetest && $(MAKE) test @cd programs/winetest && $(MAKE) test
@cd dlls && $(MAKE) test @cd dlls && $(MAKE) test
......
...@@ -794,7 +794,7 @@ install:: $(SUBDIRS:%=%/__install__) ...@@ -794,7 +794,7 @@ install:: $(SUBDIRS:%=%/__install__)
uninstall:: $(SUBDIRS:%=%/__uninstall__) uninstall:: $(SUBDIRS:%=%/__uninstall__)
test:: $(SUBDIRS:%=%/__test__) check test:: $(SUBDIRS:%=%/__test__)
checklink:: $(SUBDIRS:%=%/__checklink__) checklink:: $(SUBDIRS:%=%/__checklink__)
......
...@@ -211,7 +211,7 @@ install:: \$(SUBDIRS:%=%/__install__) ...@@ -211,7 +211,7 @@ install:: \$(SUBDIRS:%=%/__install__)
uninstall:: \$(SUBDIRS:%=%/__uninstall__) uninstall:: \$(SUBDIRS:%=%/__uninstall__)
test:: \$(SUBDIRS:%=%/__test__) check test:: \$(SUBDIRS:%=%/__test__)
checklink:: \$(SUBDIRS:%=%/__checklink__) checklink:: \$(SUBDIRS:%=%/__checklink__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment