• R/O
  • HTTP
  • SSH
  • HTTPS

mingw-org-wsl: コミット

The MinGW.org Windows System Libraries


コミットメタ情報

リビジョン24776ba02c4870e77fda6a586b8586863672c40e (tree)
日時2020-01-18 04:41:14
作者Keith Marshall <keith@user...>
コミッターKeith Marshall

ログメッセージ

Preserve order of tests for integrity of header files.

変更サマリ

差分

--- a/mingwrt/ChangeLog
+++ b/mingwrt/ChangeLog
@@ -1,5 +1,15 @@
11 2020-01-17 Keith Marshall <keith@users.osdn.me>
22
3+ Preserve order of tests for integrity of header files.
4+
5+ * tests/Makefile.in: Explicitly sort $wildcard output, within...
6+ (list_headers): ...this new function-style macro.
7+ (enum_headers): Use it.
8+
9+ * tests/headers.at: Adjust to recent GNU make $sort order.
10+
11+2020-01-17 Keith Marshall <keith@users.osdn.me>
12+
313 Update handling of <process.h> test-suite limitation.
414
515 * include/process.h (-Wbuiltin-declaration-mismatch)
--- a/mingwrt/tests/Makefile.in
+++ b/mingwrt/tests/Makefile.in
@@ -5,7 +5,7 @@
55 # $Id$
66 #
77 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
8-# Copyright (C) 2016, 2017, 2019, MinGW.org Project
8+# Copyright (C) 2016, 2017, 2019, 2020, MinGW.org Project
99 #
1010 #
1111 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -85,13 +85,14 @@ testsuite.at.tmp: %.tmp: ../config.status %.in
8585 headers.at.pretest: MINGWRT_AT_ENUM := MINGWRT_AT_PACKAGE_HEADERS
8686 headers.at.pretest: %.pretest:
8787 sed '/^m4_define(\[$(MINGWRT_AT_ENUM)],/q' ${srcdir}/$* > $@
88- $(call enum_headers,hdr,${top_srcdir}/include, dnl >> $@;)
89- $(call enum_headers,hdr,${top_srcdir}/include/sys, dnl >> $@;,sys)
88+ $(call enum_headers,${top_srcdir}/include) >> $@
89+ $(call enum_headers,${top_srcdir}/include, sys) >> $@
9090 sed -n '/^])# $(MINGWRT_AT_ENUM)/,$$p' ${srcdir}/$* >> $@
9191 cmp -s $@ ${srcdir}/$* || cp -f $@ ${srcdir}/$*
9292 $(RM) $@
9393
94-enum_headers = $(foreach $1,$(notdir $(wildcard $2/*.h)),echo $(4:%=%/)$($1)$3)
94+enum_headers = printf '%s dnl\n' $(call list_headers,$1$(2:%=/%),$(2:%=%/))
95+list_headers = $(addprefix $2,$(sort $(notdir $(wildcard $1/*.h))))
9596
9697 # Compile the testsuite, from autotest sources.
9798 #
--- a/mingwrt/tests/headers.at
+++ b/mingwrt/tests/headers.at
@@ -8,7 +8,7 @@
88 # $Id$
99 #
1010 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
11-# Copyright (C) 2016, MinGW.org Project
11+# Copyright (C) 2016, 2020, MinGW.org Project
1212 #
1313 #
1414 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -42,9 +42,9 @@ assert.h dnl
4242 complex.h dnl
4343 conio.h dnl
4444 ctype.h dnl
45+dir.h dnl
4546 direct.h dnl
4647 dirent.h dnl
47-dir.h dnl
4848 dlfcn.h dnl
4949 dos.h dnl
5050 errno.h dnl
@@ -89,8 +89,8 @@ sys/file.h dnl
8989 sys/locking.h dnl
9090 sys/param.h dnl
9191 sys/stat.h dnl
92-sys/timeb.h dnl
9392 sys/time.h dnl
93+sys/timeb.h dnl
9494 sys/types.h dnl
9595 sys/unistd.h dnl
9696 sys/utime.h dnl
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,13 @@
1+2020-01-17 Keith Marshall <keith@users.osdn.me>
2+
3+ Preserve order of tests for integrity of header files.
4+
5+ * tests/Makefile.in: Explicitly sort $wildcard output, within...
6+ (list_headers): ...this new function-style macro.
7+ (enum_headers, enum_header_subdirs): Use it.
8+
9+ * tests/headers.at: Adjust to recent GNU make $sort order.
10+
111 2020-01-15 Keith Marshall <keith@users.osdn.me>
212
313 Incorporate <winnls.h> updates for Vista and Windows-7.
--- a/w32api/tests/Makefile.in
+++ b/w32api/tests/Makefile.in
@@ -5,7 +5,7 @@
55 # $Id$
66 #
77 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
8-# Copyright (C) 2017, 2019, MinGW.org Project
8+# Copyright (C) 2017, 2019, 2020, MinGW.org Project
99 #
1010 #
1111 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -85,14 +85,15 @@ testsuite.at.tmp: %.tmp: ../config.status %.in
8585 headers.at.pretest: W32API_AT_ENUM := W32API_AT_PACKAGE_HEADERS
8686 headers.at.pretest: %.pretest:
8787 sed '/^m4_define(\[$(W32API_AT_ENUM)],/q' ${srcdir}/$* > $@
88- $(call enum_headers,hdr,${top_srcdir}/include, dnl >> $@;)
89- $(call enum_header_subdirs,${top_srcdir}/include,$(HEADER_SUBDIRS),$@;)
88+ $(call enum_headers,${top_srcdir}/include) >> $@
89+ $(call enum_header_subdirs,${top_srcdir}/include,$(HEADER_SUBDIRS))
9090 sed -n '/^])# $(W32API_AT_ENUM)/,$$p' ${srcdir}/$* >> $@
9191 cmp -s $@ ${srcdir}/$* || cp -f $@ ${srcdir}/$*
9292 $(RM) $@
9393
94-enum_headers = $(foreach $1,$(notdir $(wildcard $2/*.h)),echo $(4:%=%/)$($1)$3)
95-enum_header_subdirs = $(foreach d,$2,$(call enum_headers,h,$1/$d, dnl >> $3,$d))
94+enum_header_subdirs = $(foreach d,$2,$(call enum_headers,$1,$d) >> $@;)
95+enum_headers = printf '%s dnl\n' $(call list_headers,$1$(2:%=/%),$(2:%=%/))
96+list_headers = $(addprefix $2,$(sort $(notdir $(wildcard $1/*.h))))
9697
9798 # Compile the testsuite, from autotest sources.
9899 #
--- a/w32api/tests/headers.at
+++ b/w32api/tests/headers.at
@@ -8,7 +8,7 @@
88 # $Id$
99 #
1010 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
11-# Copyright (C) 2017, MinGW.org Project
11+# Copyright (C) 2017, 2020, MinGW.org Project
1212 #
1313 #
1414 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -57,8 +57,8 @@ comcat.h dnl
5757 commctrl.h dnl
5858 commdlg.h dnl
5959 control.h dnl
60-cplext.h dnl
6160 cpl.h dnl
61+cplext.h dnl
6262 custcntl.h dnl
6363 dbt.h dnl
6464 dde.h dnl
@@ -104,6 +104,7 @@ isguids.h dnl
104104 ks.h dnl
105105 ksmedia.h dnl
106106 largeint.h dnl
107+lm.h dnl
107108 lmaccess.h dnl
108109 lmalert.h dnl
109110 lmapibuf.h dnl
@@ -115,7 +116,6 @@ lmconfig.h dnl
115116 lmcons.h dnl
116117 lmerr.h dnl
117118 lmerrlog.h dnl
118-lm.h dnl
119119 lmmsg.h dnl
120120 lmremutl.h dnl
121121 lmrepl.h dnl
@@ -124,8 +124,8 @@ lmshare.h dnl
124124 lmsname.h dnl
125125 lmstats.h dnl
126126 lmsvc.h dnl
127-lmuseflg.h dnl
128127 lmuse.h dnl
128+lmuseflg.h dnl
129129 lmwksta.h dnl
130130 lzexpand.h dnl
131131 mapi.h dnl
@@ -160,6 +160,7 @@ objsafe.h dnl
160160 objsel.h dnl
161161 ocidl.h dnl
162162 odbcinst.h dnl
163+ole.h dnl
163164 ole2.h dnl
164165 ole2ver.h dnl
165166 oleacc.h dnl
@@ -167,7 +168,6 @@ oleauto.h dnl
167168 olectl.h dnl
168169 olectlid.h dnl
169170 oledlg.h dnl
170-ole.h dnl
171171 oleidl.h dnl
172172 poppack.h dnl
173173 powrprof.h dnl
@@ -179,19 +179,19 @@ pshpack4.h dnl
179179 pshpack8.h dnl
180180 qedit.h dnl
181181 rapi.h dnl
182+ras.h dnl
182183 rasdlg.h dnl
183184 raserror.h dnl
184-ras.h dnl
185185 rassapi.h dnl
186186 reason.h dnl
187187 regstr.h dnl
188188 richedit.h dnl
189189 richole.h dnl
190190 routprot.h dnl
191-rpcdce2.h dnl
191+rpc.h dnl
192192 rpcdce.h dnl
193+rpcdce2.h dnl
193194 rpcdcep.h dnl
194-rpc.h dnl
195195 rpcndr.h dnl
196196 rpcnsi.h dnl
197197 rpcnsip.h dnl
@@ -215,8 +215,8 @@ shlwapi.h dnl
215215 shobjidl.h dnl
216216 snmp.h dnl
217217 specstrings.h dnl
218-sqlext.h dnl
219218 sql.h dnl
219+sqlext.h dnl
220220 sqltypes.h dnl
221221 sqlucode.h dnl
222222 sspi.h dnl
@@ -254,8 +254,8 @@ winperf.h dnl
254254 winreg.h dnl
255255 winresrc.h dnl
256256 winsnmp.h dnl
257-winsock2.h dnl
258257 winsock.h dnl
258+winsock2.h dnl
259259 winspool.h dnl
260260 winsvc.h dnl
261261 winuser.h dnl
旧リポジトリブラウザで表示