Alexandre Julliard : makefiles: Add support for having tests under the programs directory.
Alexandre Julliard
julliard at winehq.org
Wed Feb 10 10:44:50 CST 2010
Module: wine
Branch: master
Commit: 4435e99540c9554883050973b7ee6277095176c0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4435e99540c9554883050973b7ee6277095176c0
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Feb 10 11:24:00 2010 +0100
makefiles: Add support for having tests under the programs directory.
---
.gitignore | 4 ++--
aclocal.m4 | 4 +++-
tools/make_makefiles | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index ec21bcf..e496cae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
*.ok
*.res
*.so
+*/*/tests/*crosstest.exe
+*/*/tests/testlist.c
/Make.rules
/Maketest.rules
/TAGS
@@ -17,8 +19,6 @@
Makefile
dlldata.c
dlls/*/*.def
-dlls/*/tests/*crosstest.exe
-dlls/*/tests/testlist.c
dlls/Makedll.rules
dlls/Makeimplib.rules
dlls/actxprxy/actxprxy_activscp.h
diff --git a/aclocal.m4 b/aclocal.m4
index 5409ba2..ae61a38 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -223,7 +223,8 @@ dnl
dnl Usage: WINE_CONFIG_TEST(dir)
dnl
AC_DEFUN([WINE_CONFIG_TEST],
-[m4_pushdef([ac_name],m4_bpatsubst([$1],[.*/\(.*\)/tests$],[\1_test]))dnl
+[m4_pushdef([ac_suffix],m4_if(m4_substr([$1],0,9),[programs/],[.exe_test],[_test]))dnl
+m4_pushdef([ac_name],[m4_bpatsubst([$1],[.*/\(.*\)/tests$],[\1])]ac_suffix)dnl
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
$1: __builddeps__
$1/__crosstest__: __buildcrossdeps__"
@@ -236,6 +237,7 @@ ac_name.rc:
echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false)
ac_name.res: ac_name.rc ac_name.exe"
WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl
+m4_popdef([ac_suffix])dnl
m4_popdef([ac_name])])
dnl **** Create a static lib makefile from config.status ****
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 85e1e41..0ae3fbe 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -90,8 +90,8 @@ my @ignores = (
"Makefile",
"dlldata.c",
"dlls/*/*.def",
- "dlls/*/tests/*crosstest.exe",
- "dlls/*/tests/testlist.c",
+ "*/*/tests/*crosstest.exe",
+ "*/*/tests/testlist.c",
"include/config.h",
"include/stamp-h",
"programs/winetest/*_test.exe",
More information about the wine-cvs
mailing list