forked from Mirrors/wine-wine
makefiles: Add support for having tests under the programs directory.
parent
cb1fc8f4f5
commit
4435e99540
|
@ -4,6 +4,8 @@
|
||||||
*.ok
|
*.ok
|
||||||
*.res
|
*.res
|
||||||
*.so
|
*.so
|
||||||
|
*/*/tests/*crosstest.exe
|
||||||
|
*/*/tests/testlist.c
|
||||||
/Make.rules
|
/Make.rules
|
||||||
/Maketest.rules
|
/Maketest.rules
|
||||||
/TAGS
|
/TAGS
|
||||||
|
@ -17,8 +19,6 @@
|
||||||
Makefile
|
Makefile
|
||||||
dlldata.c
|
dlldata.c
|
||||||
dlls/*/*.def
|
dlls/*/*.def
|
||||||
dlls/*/tests/*crosstest.exe
|
|
||||||
dlls/*/tests/testlist.c
|
|
||||||
dlls/Makedll.rules
|
dlls/Makedll.rules
|
||||||
dlls/Makeimplib.rules
|
dlls/Makeimplib.rules
|
||||||
dlls/actxprxy/actxprxy_activscp.h
|
dlls/actxprxy/actxprxy_activscp.h
|
||||||
|
|
|
@ -223,7 +223,8 @@ dnl
|
||||||
dnl Usage: WINE_CONFIG_TEST(dir)
|
dnl Usage: WINE_CONFIG_TEST(dir)
|
||||||
dnl
|
dnl
|
||||||
AC_DEFUN([WINE_CONFIG_TEST],
|
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
|
ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
|
||||||
$1: __builddeps__
|
$1: __builddeps__
|
||||||
$1/__crosstest__: __buildcrossdeps__"
|
$1/__crosstest__: __buildcrossdeps__"
|
||||||
|
@ -236,6 +237,7 @@ ac_name.rc:
|
||||||
echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false)
|
echo \"ac_name.exe TESTRES \\\"ac_name.exe\\\"\" >\$[@] || (\$(RM) \$[@] && false)
|
||||||
ac_name.res: ac_name.rc ac_name.exe"
|
ac_name.res: ac_name.rc ac_name.exe"
|
||||||
WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl
|
WINE_CONFIG_MAKEFILE([$1/Makefile],[Maketest.rules],[],[ALL_TEST_DIRS],[enable_tests])dnl
|
||||||
|
m4_popdef([ac_suffix])dnl
|
||||||
m4_popdef([ac_name])])
|
m4_popdef([ac_name])])
|
||||||
|
|
||||||
dnl **** Create a static lib makefile from config.status ****
|
dnl **** Create a static lib makefile from config.status ****
|
||||||
|
|
|
@ -90,8 +90,8 @@ my @ignores = (
|
||||||
"Makefile",
|
"Makefile",
|
||||||
"dlldata.c",
|
"dlldata.c",
|
||||||
"dlls/*/*.def",
|
"dlls/*/*.def",
|
||||||
"dlls/*/tests/*crosstest.exe",
|
"*/*/tests/*crosstest.exe",
|
||||||
"dlls/*/tests/testlist.c",
|
"*/*/tests/testlist.c",
|
||||||
"include/config.h",
|
"include/config.h",
|
||||||
"include/stamp-h",
|
"include/stamp-h",
|
||||||
"programs/winetest/*_test.exe",
|
"programs/winetest/*_test.exe",
|
||||||
|
|
Loading…
Reference in New Issue