From 534fac983d56f477a98e6f76903277061b71b94c Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Mon, 11 Sep 2006 14:32:00 +0200 Subject: [PATCH] winetest: Generate the list of test resources in make_makefiles. Only include test revision information in the distributed binary. --- programs/winetest/.gitignore | 2 +- programs/winetest/Makefile.in | 222 +++++++++++++++++----------------- programs/winetest/dist.rc | 1 + programs/winetest/maketest | 6 - programs/winetest/winetest.rc | 59 ++++++++- tools/make_makefiles | 13 +- 6 files changed, 179 insertions(+), 124 deletions(-) diff --git a/programs/winetest/.gitignore b/programs/winetest/.gitignore index cfd4d1bccf7..8d9f79aa34c 100644 --- a/programs/winetest/.gitignore +++ b/programs/winetest/.gitignore @@ -1 +1 @@ -/tests.rc +/*_test.exe diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 1adc1051c26..4dff829d91e 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -23,179 +23,174 @@ RC_BINARIES = wine.ico # List of test executables (auto-generated by make_makefiles) TESTBINS = \ - advapi32_test.exe$(DLLEXT) \ - advpack_test.exe$(DLLEXT) \ - cabinet_test.exe$(DLLEXT) \ - comcat_test.exe$(DLLEXT) \ - comctl32_test.exe$(DLLEXT) \ - comdlg32_test.exe$(DLLEXT) \ - crypt32_test.exe$(DLLEXT) \ - d3d8_test.exe$(DLLEXT) \ - d3d9_test.exe$(DLLEXT) \ - ddraw_test.exe$(DLLEXT) \ - dinput_test.exe$(DLLEXT) \ - dnsapi_test.exe$(DLLEXT) \ - dsound_test.exe$(DLLEXT) \ - gdi32_test.exe$(DLLEXT) \ - hlink_test.exe$(DLLEXT) \ - infosoft_test.exe$(DLLEXT) \ - iphlpapi_test.exe$(DLLEXT) \ - kernel32_test.exe$(DLLEXT) \ - lz32_test.exe$(DLLEXT) \ - mapi32_test.exe$(DLLEXT) \ - mlang_test.exe$(DLLEXT) \ - msacm32_test.exe$(DLLEXT) \ - mscms_test.exe$(DLLEXT) \ - mshtml_test.exe$(DLLEXT) \ - msi_test.exe$(DLLEXT) \ - msvcrt_test.exe$(DLLEXT) \ - msvcrtd_test.exe$(DLLEXT) \ - msxml3_test.exe$(DLLEXT) \ - netapi32_test.exe$(DLLEXT) \ - ntdll_test.exe$(DLLEXT) \ - ole32_test.exe$(DLLEXT) \ - oleaut32_test.exe$(DLLEXT) \ - psapi_test.exe$(DLLEXT) \ - quartz_test.exe$(DLLEXT) \ - riched20_test.exe$(DLLEXT) \ - rpcrt4_test.exe$(DLLEXT) \ - rsabase_test.exe$(DLLEXT) \ - rsaenh_test.exe$(DLLEXT) \ - secur32_test.exe$(DLLEXT) \ - setupapi_test.exe$(DLLEXT) \ - shdocvw_test.exe$(DLLEXT) \ - shell32_test.exe$(DLLEXT) \ - shlwapi_test.exe$(DLLEXT) \ - urlmon_test.exe$(DLLEXT) \ - user32_test.exe$(DLLEXT) \ - usp10_test.exe$(DLLEXT) \ - uxtheme_test.exe$(DLLEXT) \ - version_test.exe$(DLLEXT) \ - wininet_test.exe$(DLLEXT) \ - winmm_test.exe$(DLLEXT) \ - winspool.drv_test.exe$(DLLEXT) \ - wintrust_test.exe$(DLLEXT) \ - ws2_32_test.exe$(DLLEXT) + advapi32_test.exe \ + advpack_test.exe \ + cabinet_test.exe \ + comcat_test.exe \ + comctl32_test.exe \ + comdlg32_test.exe \ + crypt32_test.exe \ + d3d8_test.exe \ + d3d9_test.exe \ + ddraw_test.exe \ + dinput_test.exe \ + dnsapi_test.exe \ + dsound_test.exe \ + gdi32_test.exe \ + hlink_test.exe \ + infosoft_test.exe \ + iphlpapi_test.exe \ + kernel32_test.exe \ + lz32_test.exe \ + mapi32_test.exe \ + mlang_test.exe \ + msacm32_test.exe \ + mscms_test.exe \ + mshtml_test.exe \ + msi_test.exe \ + msvcrt_test.exe \ + msvcrtd_test.exe \ + msxml3_test.exe \ + netapi32_test.exe \ + ntdll_test.exe \ + ole32_test.exe \ + oleaut32_test.exe \ + psapi_test.exe \ + quartz_test.exe \ + riched20_test.exe \ + rpcrt4_test.exe \ + rsabase_test.exe \ + rsaenh_test.exe \ + secur32_test.exe \ + setupapi_test.exe \ + shdocvw_test.exe \ + shell32_test.exe \ + shlwapi_test.exe \ + urlmon_test.exe \ + user32_test.exe \ + usp10_test.exe \ + uxtheme_test.exe \ + version_test.exe \ + wininet_test.exe \ + winmm_test.exe \ + winspool.drv_test.exe \ + wintrust_test.exe \ + ws2_32_test.exe -advapi32_test.exe$(DLLEXT): $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) +advapi32_test.exe: $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) cp $(DLLDIR)/advapi32/tests/advapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -advpack_test.exe$(DLLEXT): $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) +advpack_test.exe: $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) cp $(DLLDIR)/advpack/tests/advpack_test.exe$(DLLEXT) $@ && $(STRIP) $@ -cabinet_test.exe$(DLLEXT): $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) +cabinet_test.exe: $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) cp $(DLLDIR)/cabinet/tests/cabinet_test.exe$(DLLEXT) $@ && $(STRIP) $@ -comcat_test.exe$(DLLEXT): $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT) +comcat_test.exe: $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT) cp $(DLLDIR)/comcat/tests/comcat_test.exe$(DLLEXT) $@ && $(STRIP) $@ -comctl32_test.exe$(DLLEXT): $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) +comctl32_test.exe: $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) cp $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -comdlg32_test.exe$(DLLEXT): $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT) +comdlg32_test.exe: $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT) cp $(DLLDIR)/comdlg32/tests/comdlg32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -crypt32_test.exe$(DLLEXT): $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) +crypt32_test.exe: $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) cp $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -d3d8_test.exe$(DLLEXT): $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) +d3d8_test.exe: $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) cp $(DLLDIR)/d3d8/tests/d3d8_test.exe$(DLLEXT) $@ && $(STRIP) $@ -d3d9_test.exe$(DLLEXT): $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) +d3d9_test.exe: $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) cp $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) $@ && $(STRIP) $@ -ddraw_test.exe$(DLLEXT): $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) +ddraw_test.exe: $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ -dinput_test.exe$(DLLEXT): $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) +dinput_test.exe: $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) cp $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT) $@ && $(STRIP) $@ -dnsapi_test.exe$(DLLEXT): $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) +dnsapi_test.exe: $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) cp $(DLLDIR)/dnsapi/tests/dnsapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -dsound_test.exe$(DLLEXT): $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) +dsound_test.exe: $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) cp $(DLLDIR)/dsound/tests/dsound_test.exe$(DLLEXT) $@ && $(STRIP) $@ -gdi32_test.exe$(DLLEXT): $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT) +gdi32_test.exe: $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT) cp $(DLLDIR)/gdi/tests/gdi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -hlink_test.exe$(DLLEXT): $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) +hlink_test.exe: $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) cp $(DLLDIR)/hlink/tests/hlink_test.exe$(DLLEXT) $@ && $(STRIP) $@ -infosoft_test.exe$(DLLEXT): $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) +infosoft_test.exe: $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) cp $(DLLDIR)/infosoft/tests/infosoft_test.exe$(DLLEXT) $@ && $(STRIP) $@ -iphlpapi_test.exe$(DLLEXT): $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) +iphlpapi_test.exe: $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) cp $(DLLDIR)/iphlpapi/tests/iphlpapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -kernel32_test.exe$(DLLEXT): $(DLLDIR)/kernel/tests/kernel32_test.exe$(DLLEXT) +kernel32_test.exe: $(DLLDIR)/kernel/tests/kernel32_test.exe$(DLLEXT) cp $(DLLDIR)/kernel/tests/kernel32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -lz32_test.exe$(DLLEXT): $(DLLDIR)/lz32/tests/lz32_test.exe$(DLLEXT) +lz32_test.exe: $(DLLDIR)/lz32/tests/lz32_test.exe$(DLLEXT) cp $(DLLDIR)/lz32/tests/lz32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -mapi32_test.exe$(DLLEXT): $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT) +mapi32_test.exe: $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT) cp $(DLLDIR)/mapi32/tests/mapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -mlang_test.exe$(DLLEXT): $(DLLDIR)/mlang/tests/mlang_test.exe$(DLLEXT) +mlang_test.exe: $(DLLDIR)/mlang/tests/mlang_test.exe$(DLLEXT) cp $(DLLDIR)/mlang/tests/mlang_test.exe$(DLLEXT) $@ && $(STRIP) $@ -msacm32_test.exe$(DLLEXT): $(DLLDIR)/msacm32/tests/msacm32_test.exe$(DLLEXT) +msacm32_test.exe: $(DLLDIR)/msacm32/tests/msacm32_test.exe$(DLLEXT) cp $(DLLDIR)/msacm32/tests/msacm32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -mscms_test.exe$(DLLEXT): $(DLLDIR)/mscms/tests/mscms_test.exe$(DLLEXT) +mscms_test.exe: $(DLLDIR)/mscms/tests/mscms_test.exe$(DLLEXT) cp $(DLLDIR)/mscms/tests/mscms_test.exe$(DLLEXT) $@ && $(STRIP) $@ -mshtml_test.exe$(DLLEXT): $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT) +mshtml_test.exe: $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT) cp $(DLLDIR)/mshtml/tests/mshtml_test.exe$(DLLEXT) $@ && $(STRIP) $@ -msi_test.exe$(DLLEXT): $(DLLDIR)/msi/tests/msi_test.exe$(DLLEXT) +msi_test.exe: $(DLLDIR)/msi/tests/msi_test.exe$(DLLEXT) cp $(DLLDIR)/msi/tests/msi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -msvcrt_test.exe$(DLLEXT): $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT) +msvcrt_test.exe: $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT) cp $(DLLDIR)/msvcrt/tests/msvcrt_test.exe$(DLLEXT) $@ && $(STRIP) $@ -msvcrtd_test.exe$(DLLEXT): $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT) +msvcrtd_test.exe: $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT) cp $(DLLDIR)/msvcrtd/tests/msvcrtd_test.exe$(DLLEXT) $@ && $(STRIP) $@ -msxml3_test.exe$(DLLEXT): $(DLLDIR)/msxml3/tests/msxml3_test.exe$(DLLEXT) +msxml3_test.exe: $(DLLDIR)/msxml3/tests/msxml3_test.exe$(DLLEXT) cp $(DLLDIR)/msxml3/tests/msxml3_test.exe$(DLLEXT) $@ && $(STRIP) $@ -netapi32_test.exe$(DLLEXT): $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) +netapi32_test.exe: $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) cp $(DLLDIR)/netapi32/tests/netapi32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -ntdll_test.exe$(DLLEXT): $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) +ntdll_test.exe: $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) cp $(DLLDIR)/ntdll/tests/ntdll_test.exe$(DLLEXT) $@ && $(STRIP) $@ -ole32_test.exe$(DLLEXT): $(DLLDIR)/ole32/tests/ole32_test.exe$(DLLEXT) +ole32_test.exe: $(DLLDIR)/ole32/tests/ole32_test.exe$(DLLEXT) cp $(DLLDIR)/ole32/tests/ole32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -oleaut32_test.exe$(DLLEXT): $(DLLDIR)/oleaut32/tests/oleaut32_test.exe$(DLLEXT) +oleaut32_test.exe: $(DLLDIR)/oleaut32/tests/oleaut32_test.exe$(DLLEXT) cp $(DLLDIR)/oleaut32/tests/oleaut32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -psapi_test.exe$(DLLEXT): $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) +psapi_test.exe: $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) cp $(DLLDIR)/psapi/tests/psapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -quartz_test.exe$(DLLEXT): $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) +quartz_test.exe: $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) cp $(DLLDIR)/quartz/tests/quartz_test.exe$(DLLEXT) $@ && $(STRIP) $@ -riched20_test.exe$(DLLEXT): $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) +riched20_test.exe: $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) cp $(DLLDIR)/riched20/tests/riched20_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rpcrt4_test.exe$(DLLEXT): $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) +rpcrt4_test.exe: $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) cp $(DLLDIR)/rpcrt4/tests/rpcrt4_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsabase_test.exe$(DLLEXT): $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) +rsabase_test.exe: $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) cp $(DLLDIR)/rsabase/tests/rsabase_test.exe$(DLLEXT) $@ && $(STRIP) $@ -rsaenh_test.exe$(DLLEXT): $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) +rsaenh_test.exe: $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) cp $(DLLDIR)/rsaenh/tests/rsaenh_test.exe$(DLLEXT) $@ && $(STRIP) $@ -secur32_test.exe$(DLLEXT): $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) +secur32_test.exe: $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) cp $(DLLDIR)/secur32/tests/secur32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -setupapi_test.exe$(DLLEXT): $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) +setupapi_test.exe: $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) cp $(DLLDIR)/setupapi/tests/setupapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -shdocvw_test.exe$(DLLEXT): $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) +shdocvw_test.exe: $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) cp $(DLLDIR)/shdocvw/tests/shdocvw_test.exe$(DLLEXT) $@ && $(STRIP) $@ -shell32_test.exe$(DLLEXT): $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) +shell32_test.exe: $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) cp $(DLLDIR)/shell32/tests/shell32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -shlwapi_test.exe$(DLLEXT): $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT) +shlwapi_test.exe: $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT) cp $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT) $@ && $(STRIP) $@ -urlmon_test.exe$(DLLEXT): $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) +urlmon_test.exe: $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) cp $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) $@ && $(STRIP) $@ -user32_test.exe$(DLLEXT): $(DLLDIR)/user/tests/user32_test.exe$(DLLEXT) +user32_test.exe: $(DLLDIR)/user/tests/user32_test.exe$(DLLEXT) cp $(DLLDIR)/user/tests/user32_test.exe$(DLLEXT) $@ && $(STRIP) $@ -usp10_test.exe$(DLLEXT): $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) +usp10_test.exe: $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) cp $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) $@ && $(STRIP) $@ -uxtheme_test.exe$(DLLEXT): $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) +uxtheme_test.exe: $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) cp $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT) $@ && $(STRIP) $@ -version_test.exe$(DLLEXT): $(DLLDIR)/version/tests/version_test.exe$(DLLEXT) +version_test.exe: $(DLLDIR)/version/tests/version_test.exe$(DLLEXT) cp $(DLLDIR)/version/tests/version_test.exe$(DLLEXT) $@ && $(STRIP) $@ -wininet_test.exe$(DLLEXT): $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) +wininet_test.exe: $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) cp $(DLLDIR)/wininet/tests/wininet_test.exe$(DLLEXT) $@ && $(STRIP) $@ -winmm_test.exe$(DLLEXT): $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) +winmm_test.exe: $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) cp $(DLLDIR)/winmm/tests/winmm_test.exe$(DLLEXT) $@ && $(STRIP) $@ -winspool.drv_test.exe$(DLLEXT): $(DLLDIR)/winspool.drv/tests/winspool.drv_test.exe$(DLLEXT) +winspool.drv_test.exe: $(DLLDIR)/winspool.drv/tests/winspool.drv_test.exe$(DLLEXT) cp $(DLLDIR)/winspool.drv/tests/winspool.drv_test.exe$(DLLEXT) $@ && $(STRIP) $@ -wintrust_test.exe$(DLLEXT): $(DLLDIR)/wintrust/tests/wintrust_test.exe$(DLLEXT) +wintrust_test.exe: $(DLLDIR)/wintrust/tests/wintrust_test.exe$(DLLEXT) cp $(DLLDIR)/wintrust/tests/wintrust_test.exe$(DLLEXT) $@ && $(STRIP) $@ -ws2_32_test.exe$(DLLEXT): $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) +ws2_32_test.exe: $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) cp $(DLLDIR)/ws2_32/tests/ws2_32_test.exe$(DLLEXT) $@ && $(STRIP) $@ # Special rules -tests.rc: maketest Makefile.in - $(SRCDIR)/maketest $(TOPSRCDIR) $(TESTBINS) > $@ || ( $(RM) $@ && exit 1 ) - -winetest.res: tests.rc $(TESTBINS) +winetest.res: $(TESTBINS) clean:: $(RM) tests.rc dist.res winetest-dist winetest-dist.exe $(TESTBINS) -depend: tests.rc - # Rules for building distributable executable .PHONY: dist @@ -211,6 +206,9 @@ winetest-dist: $(WINEWRAPPER) winetest-dist.exe: $(OBJS) dist.res.o Makefile.in $(CC) $(APPMODE) $(OBJS) dist.res.o -o $@ $(DELAYIMPORTS:%=-l%) $(ALL_LIBS) +tests.rc: maketest Makefile.in + $(SRCDIR)/maketest $(TOPSRCDIR) > $@ || ($(RM) $@ && exit 1) + dist.res: winetest.rc tests.rc build.id build.nfo tests.url $(TESTBINS) $(RC_BINARIES) ### Dependencies: diff --git a/programs/winetest/dist.rc b/programs/winetest/dist.rc index a68c71dacd4..7bd6362f9fb 100644 --- a/programs/winetest/dist.rc +++ b/programs/winetest/dist.rc @@ -19,6 +19,7 @@ */ #include "winetest.rc" +#include "tests.rc" WINE_BUILD STRINGRES "build.id" BUILD_INFO STRINGRES "build.nfo" diff --git a/programs/winetest/maketest b/programs/winetest/maketest index 0f907d910cb..ff4d88b009f 100755 --- a/programs/winetest/maketest +++ b/programs/winetest/maketest @@ -4,7 +4,6 @@ TOPSRCDIR="$1" shift echo "/* Automatically generated -- do not edit! */" -echo "#include \"resource.h\"" echo "STRINGTABLE {" i=0 @@ -24,8 +23,3 @@ while read line; do done echo "}" - -for test -do - echo "$test TESTRES \"$test\"" -done diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index e7b411523a6..7cdf3010218 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -21,10 +21,9 @@ #include #include #include "resource.h" -#include "tests.rc" IDD_TAG DIALOG 0, 0, 150, 65 -STYLE WS_POPUP +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied" BEGIN CTEXT "Please supply a tag for your report. You can use letters, digits, dashes and periods." @@ -144,3 +143,59 @@ IDI_WINE ICON "wine.ico" '00 00 FC 0F 00 00 FE 07 00 00 FE F7 00 00 FF 77' '00 00 FF 0F 00 00' } */ + +/* list of tests (automatically generated by make_makefiles) */ + +advapi32_test.exe TESTRES "advapi32_test.exe" +advpack_test.exe TESTRES "advpack_test.exe" +cabinet_test.exe TESTRES "cabinet_test.exe" +comcat_test.exe TESTRES "comcat_test.exe" +comctl32_test.exe TESTRES "comctl32_test.exe" +comdlg32_test.exe TESTRES "comdlg32_test.exe" +crypt32_test.exe TESTRES "crypt32_test.exe" +d3d8_test.exe TESTRES "d3d8_test.exe" +d3d9_test.exe TESTRES "d3d9_test.exe" +ddraw_test.exe TESTRES "ddraw_test.exe" +dinput_test.exe TESTRES "dinput_test.exe" +dnsapi_test.exe TESTRES "dnsapi_test.exe" +dsound_test.exe TESTRES "dsound_test.exe" +gdi32_test.exe TESTRES "gdi32_test.exe" +hlink_test.exe TESTRES "hlink_test.exe" +infosoft_test.exe TESTRES "infosoft_test.exe" +iphlpapi_test.exe TESTRES "iphlpapi_test.exe" +kernel32_test.exe TESTRES "kernel32_test.exe" +lz32_test.exe TESTRES "lz32_test.exe" +mapi32_test.exe TESTRES "mapi32_test.exe" +mlang_test.exe TESTRES "mlang_test.exe" +msacm32_test.exe TESTRES "msacm32_test.exe" +mscms_test.exe TESTRES "mscms_test.exe" +mshtml_test.exe TESTRES "mshtml_test.exe" +msi_test.exe TESTRES "msi_test.exe" +msvcrt_test.exe TESTRES "msvcrt_test.exe" +msvcrtd_test.exe TESTRES "msvcrtd_test.exe" +msxml3_test.exe TESTRES "msxml3_test.exe" +netapi32_test.exe TESTRES "netapi32_test.exe" +ntdll_test.exe TESTRES "ntdll_test.exe" +ole32_test.exe TESTRES "ole32_test.exe" +oleaut32_test.exe TESTRES "oleaut32_test.exe" +psapi_test.exe TESTRES "psapi_test.exe" +quartz_test.exe TESTRES "quartz_test.exe" +riched20_test.exe TESTRES "riched20_test.exe" +rpcrt4_test.exe TESTRES "rpcrt4_test.exe" +rsabase_test.exe TESTRES "rsabase_test.exe" +rsaenh_test.exe TESTRES "rsaenh_test.exe" +secur32_test.exe TESTRES "secur32_test.exe" +setupapi_test.exe TESTRES "setupapi_test.exe" +shdocvw_test.exe TESTRES "shdocvw_test.exe" +shell32_test.exe TESTRES "shell32_test.exe" +shlwapi_test.exe TESTRES "shlwapi_test.exe" +urlmon_test.exe TESTRES "urlmon_test.exe" +user32_test.exe TESTRES "user32_test.exe" +usp10_test.exe TESTRES "usp10_test.exe" +uxtheme_test.exe TESTRES "uxtheme_test.exe" +version_test.exe TESTRES "version_test.exe" +wininet_test.exe TESTRES "wininet_test.exe" +winmm_test.exe TESTRES "winmm_test.exe" +winspool.drv_test.exe TESTRES "winspool.drv_test.exe" +wintrust_test.exe TESTRES "wintrust_test.exe" +ws2_32_test.exe TESTRES "ws2_32_test.exe" diff --git a/tools/make_makefiles b/tools/make_makefiles index 4a2d78e0010..f4961225ed1 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -93,7 +93,7 @@ replace_in_file( "configure.ac", '^AC_CONFIG_FILES\(', '\]\)$', ################################################################ -# update the tests list in programs/winetest/Makefile.in +# update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc my %modules = ( "kernel" => "kernel32", "gdi" => "gdi32", "user" => "user32" ); my %tests; @@ -106,7 +106,7 @@ foreach my $file (sort grep /^dlls\/.*\/tests\/Makefile/, @makefiles) my $dir = $1; my $mod = $modules{$dir} || $dir; $tests{$mod} = $dir; - push @lines, " \\\n\t${mod}_test.exe\$(DLLEXT)"; + push @lines, " \\\n\t${mod}_test.exe"; } } push @lines, "\n\n"; @@ -114,13 +114,20 @@ push @lines, "\n\n"; foreach my $test (sort keys %tests) { my $dir = $tests{$test}; - push @lines, "${test}_test.exe\$(DLLEXT): \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT)\n"; + push @lines, "${test}_test.exe: \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT)\n"; push @lines, "\tcp \$(DLLDIR)/$dir/tests/${test}_test.exe\$(DLLEXT) \$\@ && \$(STRIP) \$\@\n"; } push @lines, "\n# Special rules\n"; replace_in_file( "programs/winetest/Makefile.in", '^TESTBINS\s*=', '^# Special rules', @lines ); +@lines = (); +foreach my $test (sort keys %tests) +{ + push @lines, "${test}_test.exe TESTRES \"${test}_test.exe\"\n"; +} + +replace_in_file( "programs/winetest/winetest.rc", ' TESTRES ', undef, @lines ); ################################################################ # update dlls/Makefile.in