make_makefiles: Add *_crosstest.exe to .gitignore.

.gitignore

@@ -16,9 +16,11 @@ dlls/Maketest.rules
 dlls/activeds/libactiveds.def
 dlls/advapi32/libadvapi32.def
 dlls/advapi32/tests/*.ok
+dlls/advapi32/tests/advapi32_crosstest.exe
 dlls/advapi32/tests/testlist.c
 dlls/advpack/libadvpack.def
 dlls/advpack/tests/*.ok
+dlls/advpack/tests/advpack_crosstest.exe
 dlls/advpack/tests/testlist.c
 dlls/amstream/version.res
 dlls/atl/atliface.h
@@ -31,6 +33,7 @@ dlls/avifile.dll16
 dlls/cabinet/cabinet.res
 dlls/cabinet/libcabinet.def
 dlls/cabinet/tests/*.ok
+dlls/cabinet/tests/cabinet_crosstest.exe
 dlls/cabinet/tests/testlist.c
 dlls/capi2032/libcapi2032.def
 dlls/cards/b1fv.bmp
@@ -96,6 +99,7 @@ dlls/cards/version.res
 dlls/cfgmgr32/libcfgmgr32.def
 dlls/clusapi/libclusapi.def
 dlls/comcat/tests/*.ok
+dlls/comcat/tests/comcat_crosstest.exe
 dlls/comcat/tests/testlist.c
 dlls/comcat/version.res
 dlls/comctl32/idb_hist_large.bmp
@@ -118,6 +122,7 @@ dlls/comctl32/rsrc.res
 dlls/comctl32/tests/*.ok
 dlls/comctl32/tests/bmp128x15.bmp
 dlls/comctl32/tests/bmp80x15.bmp
+dlls/comctl32/tests/comctl32_crosstest.exe
 dlls/comctl32/tests/rsrc.res
 dlls/comctl32/tests/testlist.c
 dlls/comdlg32/800.bmp
@@ -135,6 +140,7 @@ dlls/comdlg32/pd32_nocollate.ico
 dlls/comdlg32/pd32_portrait.ico
 dlls/comdlg32/rsrc.res
 dlls/comdlg32/tests/*.ok
+dlls/comdlg32/tests/comdlg32_crosstest.exe
 dlls/comdlg32/tests/testlist.c
 dlls/comm.drv16
 dlls/commdlg.dll16
@@ -144,6 +150,7 @@ dlls/crtdll/libcrtdll.def
 dlls/crypt32/crypt32.res
 dlls/crypt32/libcrypt32.def
 dlls/crypt32/tests/*.ok
+dlls/crypt32/tests/crypt32_crosstest.exe
 dlls/crypt32/tests/testlist.c
 dlls/cryptdll/libcryptdll.def
 dlls/ctl3d.dll16
@@ -151,10 +158,12 @@ dlls/ctl3d32/libctl3d32.def
 dlls/ctl3dv2.dll16
 dlls/d3d8/libd3d8.def
 dlls/d3d8/tests/*.ok
+dlls/d3d8/tests/d3d8_crosstest.exe
 dlls/d3d8/tests/testlist.c
 dlls/d3d8/version.res
 dlls/d3d9/libd3d9.def
 dlls/d3d9/tests/*.ok
+dlls/d3d9/tests/d3d9_crosstest.exe
 dlls/d3d9/tests/testlist.c
 dlls/d3d9/version.res
 dlls/d3dim/libd3dim.def
@@ -169,11 +178,13 @@ dlls/dciman32/libdciman32.def
 dlls/ddeml.dll16
 dlls/ddraw/libddraw.def
 dlls/ddraw/tests/*.ok
+dlls/ddraw/tests/ddraw_crosstest.exe
 dlls/ddraw/tests/testlist.c
 dlls/ddraw/version.res
 dlls/devenum/devenum.res
 dlls/dinput/libdinput.def
 dlls/dinput/tests/*.ok
+dlls/dinput/tests/dinput_crosstest.exe
 dlls/dinput/tests/testlist.c
 dlls/dinput/version.res
 dlls/dinput8/libdinput8.def
@@ -192,6 +203,7 @@ dlls/dmusic32/libdmusic32.def
 dlls/dmusic32/version.res
 dlls/dnsapi/libdnsapi.def
 dlls/dnsapi/tests/*.ok
+dlls/dnsapi/tests/dnsapi_crosstest.exe
 dlls/dnsapi/tests/testlist.c
 dlls/dplay/libdplay.def
 dlls/dplay/version.res
@@ -202,6 +214,7 @@ dlls/dpnet/version.res
 dlls/dpnhpast/version.res
 dlls/dsound/libdsound.def
 dlls/dsound/tests/*.ok
+dlls/dsound/tests/dsound_crosstest.exe
 dlls/dsound/tests/testlist.c
 dlls/dsound/version.res
 dlls/dswave/version.res
@@ -209,6 +222,7 @@ dlls/dxdiagn/version.res
 dlls/gdi.exe16
 dlls/gdi32/libgdi32.def
 dlls/gdi32/tests/*.ok
+dlls/gdi32/tests/gdi32_crosstest.exe
 dlls/gdi32/tests/testlist.c
 dlls/gdi32/version.res
 dlls/gdi32/version16.res
@@ -219,6 +233,7 @@ dlls/hid/libhid.def
 dlls/hid/version.res
 dlls/hlink/libhlink.def
 dlls/hlink/tests/*.ok
+dlls/hlink/tests/hlink_crosstest.exe
 dlls/hlink/tests/testlist.c
 dlls/iccvid/rsrc.res
 dlls/icmp/libicmp.def
@@ -226,13 +241,16 @@ dlls/imagehlp/libimagehlp.def
 dlls/imm.dll16
 dlls/imm32/libimm32.def
 dlls/infosoft/tests/*.ok
+dlls/infosoft/tests/infosoft_crosstest.exe
 dlls/infosoft/tests/testlist.c
 dlls/iphlpapi/libiphlpapi.def
 dlls/iphlpapi/tests/*.ok
+dlls/iphlpapi/tests/iphlpapi_crosstest.exe
 dlls/iphlpapi/tests/testlist.c
 dlls/itss/rsrc.res
 dlls/itss/tests/*.ok
 dlls/itss/tests/data.chm
+dlls/itss/tests/itss_crosstest.exe
 dlls/itss/tests/rsrc.res
 dlls/itss/tests/testlist.c
 dlls/kernel32/kernel.res
@@ -241,6 +259,7 @@ dlls/kernel32/nls/winerr_deu.mc.rc
 dlls/kernel32/nls/winerr_enu.mc.rc
 dlls/kernel32/nls/winerr_kor.mc.rc
 dlls/kernel32/tests/*.ok
+dlls/kernel32/tests/kernel32_crosstest.exe
 dlls/kernel32/tests/testlist.c
 dlls/kernel32/version16.res
 dlls/keyboard.drv16
@@ -248,17 +267,21 @@ dlls/krnl386.exe16
 dlls/libwinspool.def
 dlls/localspl/localspl.res
 dlls/localspl/tests/*.ok
+dlls/localspl/tests/localspl_crosstest.exe
 dlls/localspl/tests/testlist.c
 dlls/lz32/liblz32.def
 dlls/lz32/tests/*.ok
+dlls/lz32/tests/lz32_crosstest.exe
 dlls/lz32/tests/testlist.c
 dlls/lzexpand.dll16
 dlls/mapi32/libmapi32.def
 dlls/mapi32/tests/*.ok
+dlls/mapi32/tests/mapi32_crosstest.exe
 dlls/mapi32/tests/testlist.c
 dlls/mciavi32/mciavi_res.res
 dlls/mlang/libmlang.def
 dlls/mlang/tests/*.ok
+dlls/mlang/tests/mlang_crosstest.exe
 dlls/mlang/tests/testlist.c
 dlls/mmsystem.dll16
 dlls/mouse.drv16
@@ -269,9 +292,11 @@ dlls/msacm.dll16
 dlls/msacm32/libmsacm32.def
 dlls/msacm32/msacm.res
 dlls/msacm32/tests/*.ok
+dlls/msacm32/tests/msacm32_crosstest.exe
 dlls/msacm32/tests/testlist.c
 dlls/mscms/libmscms.def
 dlls/mscms/tests/*.ok
+dlls/mscms/tests/mscms_crosstest.exe
 dlls/mscms/tests/testlist.c
 dlls/mscms/version.res
 dlls/msdmo/libmsdmo.def
@@ -280,6 +305,7 @@ dlls/mshtml/libmshtml.def
 dlls/mshtml/nsiface.h
 dlls/mshtml/rsrc.res
 dlls/mshtml/tests/*.ok
+dlls/mshtml/tests/mshtml_crosstest.exe
 dlls/mshtml/tests/testlist.c
 dlls/msi/cond.tab.c
 dlls/msi/cond.tab.h
@@ -291,17 +317,20 @@ dlls/msi/msi.res
 dlls/msi/sql.tab.c
 dlls/msi/sql.tab.h
 dlls/msi/tests/*.ok
+dlls/msi/tests/msi_crosstest.exe
 dlls/msi/tests/testlist.c
 dlls/msimg32/libmsimg32.def
 dlls/msrle32/rsrc.res
 dlls/msvcrt/libmsvcrt.def
 dlls/msvcrt/rsrc.res
 dlls/msvcrt/tests/*.ok
+dlls/msvcrt/tests/msvcrt_crosstest.exe
 dlls/msvcrt/tests/testlist.c
 dlls/msvcrt20/libmsvcrt20.def
 dlls/msvcrt40/libmsvcrt40.def
 dlls/msvcrtd/libmsvcrtd.def
 dlls/msvcrtd/tests/*.ok
+dlls/msvcrtd/tests/msvcrtd_crosstest.exe
 dlls/msvcrtd/tests/testlist.c
 dlls/msvfw32/libmsvfw32.def
 dlls/msvfw32/rsrc.res
@@ -310,15 +339,18 @@ dlls/msvideo.dll16
 dlls/mswsock/libmswsock.def
 dlls/mswsock/version.res
 dlls/msxml3/tests/*.ok
+dlls/msxml3/tests/msxml3_crosstest.exe
 dlls/msxml3/tests/testlist.c
 dlls/msxml3/version.res
 dlls/nddeapi/libnddeapi.def
 dlls/netapi32/libnetapi32.def
 dlls/netapi32/tests/*.ok
+dlls/netapi32/tests/netapi32_crosstest.exe
 dlls/netapi32/tests/testlist.c
 dlls/newdev/libnewdev.def
 dlls/ntdll/libntdll.def
 dlls/ntdll/tests/*.ok
+dlls/ntdll/tests/ntdll_crosstest.exe
 dlls/ntdll/tests/testlist.c
 dlls/ntdsapi/libntdsapi.def
 dlls/objsel/objsel.res
@@ -338,11 +370,13 @@ dlls/ole32/libole32.def
 dlls/ole32/nodrop.cur
 dlls/ole32/ole32res.res
 dlls/ole32/tests/*.ok
+dlls/ole32/tests/ole32_crosstest.exe
 dlls/ole32/tests/testlist.c
 dlls/oleacc/liboleacc.def
 dlls/oleaut32/liboleaut32.def
 dlls/oleaut32/oleaut32.res
 dlls/oleaut32/tests/*.ok
+dlls/oleaut32/tests/oleaut32_crosstest.exe
 dlls/oleaut32/tests/testlist.c
 dlls/olecli.dll16
 dlls/olecli32/libolecli32.def
@@ -357,10 +391,12 @@ dlls/opengl32/version.res
 dlls/powrprof/libpowrprof.def
 dlls/psapi/libpsapi.def
 dlls/psapi/tests/*.ok
+dlls/psapi/tests/psapi_crosstest.exe
 dlls/psapi/tests/testlist.c
 dlls/qcap/version.res
 dlls/quartz/libquartz.def
 dlls/quartz/tests/*.ok
+dlls/quartz/tests/quartz_crosstest.exe
 dlls/quartz/tests/testlist.c
 dlls/quartz/version.res
 dlls/rasapi16.dll16
@@ -368,20 +404,25 @@ dlls/rasapi32/librasapi32.def
 dlls/resutils/libresutils.def
 dlls/riched20/libriched20.def
 dlls/riched20/tests/*.ok
+dlls/riched20/tests/riched20_crosstest.exe
 dlls/riched20/tests/testlist.c
 dlls/riched20/version.res
 dlls/riched32/version.res
 dlls/rpcrt4/librpcrt4.def
 dlls/rpcrt4/tests/*.ok
+dlls/rpcrt4/tests/rpcrt4_crosstest.exe
 dlls/rpcrt4/tests/testlist.c
 dlls/rsabase/tests/*.ok
+dlls/rsabase/tests/rsabase_crosstest.exe
 dlls/rsabase/tests/testlist.c
 dlls/rsaenh/librsaenh.def
 dlls/rsaenh/tests/*.ok
+dlls/rsaenh/tests/rsaenh_crosstest.exe
 dlls/rsaenh/tests/testlist.c
 dlls/sane.ds/rsrc.res
 dlls/secur32/libsecur32.def
 dlls/secur32/tests/*.ok
+dlls/secur32/tests/secur32_crosstest.exe
 dlls/secur32/tests/testlist.c
 dlls/sensapi/libsensapi.def
 dlls/serialui/libserialui.def
@@ -389,6 +430,7 @@ dlls/serialui/serialui_rc.res
 dlls/setupapi/libsetupapi.def
 dlls/setupapi/setupapi.res
 dlls/setupapi/tests/*.ok
+dlls/setupapi/tests/setupapi_crosstest.exe
 dlls/setupapi/tests/testlist.c
 dlls/setupx.dll16
 dlls/sfc/libsfc.def
@@ -397,6 +439,7 @@ dlls/shdocvw/libshdocvw.def
 dlls/shdocvw/shdocvw.res
 dlls/shdocvw/shdocvw_v1.tlb
 dlls/shdocvw/tests/*.ok
+dlls/shdocvw/tests/shdocvw_crosstest.exe
 dlls/shdocvw/tests/testlist.c
 dlls/shell.dll16
 dlls/shell32/cdrom.ico
@@ -418,6 +461,7 @@ dlls/shell32/searching.avi
 dlls/shell32/shortcut.ico
 dlls/shell32/shres.res
 dlls/shell32/tests/*.ok
+dlls/shell32/tests/shell32_crosstest.exe
 dlls/shell32/tests/testlist.c
 dlls/shell32/trash_file.ico
 dlls/shell32/version16.res
@@ -426,6 +470,7 @@ dlls/shfolder/version.res
 dlls/shlwapi/libshlwapi.def
 dlls/shlwapi/shlwapi.res
 dlls/shlwapi/tests/*.ok
+dlls/shlwapi/tests/shlwapi_crosstest.exe
 dlls/shlwapi/tests/testlist.c
 dlls/snmpapi/libsnmpapi.def
 dlls/sound.drv16
@@ -447,6 +492,7 @@ dlls/urlmon/liburlmon.def
 dlls/urlmon/rsrc.res
 dlls/urlmon/tests/*.ok
 dlls/urlmon/tests/testlist.c
+dlls/urlmon/tests/urlmon_crosstest.exe
 dlls/user.exe16
 dlls/user32/libuser32.def
 dlls/user32/resources/display.res
@@ -515,12 +561,15 @@ dlls/user32/tests/*.ok
 dlls/user32/tests/resource.res
 dlls/user32/tests/test_mono.bmp
 dlls/user32/tests/testlist.c
+dlls/user32/tests/user32_crosstest.exe
 dlls/usp10/libusp10.def
 dlls/usp10/tests/*.ok
 dlls/usp10/tests/testlist.c
+dlls/usp10/tests/usp10_crosstest.exe
 dlls/uxtheme/libuxtheme.def
 dlls/uxtheme/tests/*.ok
 dlls/uxtheme/tests/testlist.c
+dlls/uxtheme/tests/uxtheme_crosstest.exe
 dlls/uxtheme/version.res
 dlls/vdmdbg/libvdmdbg.def
 dlls/ver.dll16
@@ -528,6 +577,7 @@ dlls/version/libversion.def
 dlls/version/tests/*.ok
 dlls/version/tests/testlist.c
 dlls/version/tests/version.res
+dlls/version/tests/version_crosstest.exe
 dlls/w32sys.dll16
 dlls/win32s16.dll16
 dlls/win87em.dll16
@@ -542,10 +592,12 @@ dlls/wininet/libwininet.def
 dlls/wininet/rsrc.res
 dlls/wininet/tests/*.ok
 dlls/wininet/tests/testlist.c
+dlls/wininet/tests/wininet_crosstest.exe
 dlls/wininet/version.res
 dlls/winmm/libwinmm.def
 dlls/winmm/tests/*.ok
 dlls/winmm/tests/testlist.c
+dlls/winmm/tests/winmm_crosstest.exe
 dlls/winmm/winmm_res.res
 dlls/winnls.dll16
 dlls/winnls32/libwinnls32.def
@@ -553,12 +605,14 @@ dlls/winsock.dll16
 dlls/winspool.drv/libwinspool.def
 dlls/winspool.drv/tests/*.ok
 dlls/winspool.drv/tests/testlist.c
+dlls/winspool.drv/tests/winspool.drv_crosstest.exe
 dlls/winspool.drv/winspool.res
 dlls/wintab.dll16
 dlls/wintab32/libwintab32.def
 dlls/wintrust/libwintrust.def
 dlls/wintrust/tests/*.ok
 dlls/wintrust/tests/testlist.c
+dlls/wintrust/tests/wintrust_crosstest.exe
 dlls/wintrust/version.res
 dlls/wldap32/libwldap32.def
 dlls/wldap32/wldap32.res
@@ -568,6 +622,7 @@ dlls/wprocs.dll16
 dlls/ws2_32/libws2_32.def
 dlls/ws2_32/tests/*.ok
 dlls/ws2_32/tests/testlist.c
+dlls/ws2_32/tests/ws2_32_crosstest.exe
 dlls/ws2_32/version.res
 dlls/wsock32/libwsock32.def
 dlls/wsock32/version.res

tools/make_makefiles

@@ -176,7 +176,7 @@ sub parse_makefile($)
             $make{"=rules"} = $makerules{$var};
             next;
         }
-        if (/^(MODULE|IMPORTLIB)\s*=\s*(.*)/)
+        if (/^(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/)
         {
             $make{$1} = $2;
             next;
@@ -346,9 +346,11 @@ sub update_dlls(@)
 
         if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
         {
+            $testdirs{$1} = "$1/tests";
+            (my $crosstest = $makefile{"TESTDLL"}) =~ s/\.dll$//;
+            push @ignores, $makefile{"=dir"} . $crosstest . "_crosstest.exe";
             push @ignores, $makefile{"=dir"} . "testlist.c";
             push @ignores, $makefile{"=dir"} . "*.ok";
-            $testdirs{$1} = "$1/tests";
             next;
         }