Skip to content

Commit d7318eb

Browse files
authored
[libc] Clean up errno header usage in wchar tests. (#157942)
See PR #157898 and PR #157517 for similar changes to math tests. Don't include libc_errno.h header, since the tests don't manipulate errno directly. Instead, where appropriate, include hdr/errno_macros.h proxy header to get errno constant values to match against.
1 parent 0b87d27 commit d7318eb

11 files changed

+22
-20
lines changed

libc/test/src/wchar/CMakeLists.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ add_libc_test(
5353
SRCS
5454
mbrtowc_test.cpp
5555
DEPENDS
56-
libc.src.__support.libc_errno
56+
libc.hdr.errno_macros
5757
libc.src.__support.wchar.mbstate
5858
libc.src.string.memset
5959
libc.src.wchar.mbrtowc
@@ -69,7 +69,7 @@ add_libc_test(
6969
SRCS
7070
mbtowc_test.cpp
7171
DEPENDS
72-
libc.src.__support.libc_errno
72+
libc.hdr.errno_macros
7373
libc.src.wchar.mbtowc
7474
libc.hdr.types.wchar_t
7575
libc.test.UnitTest.ErrnoCheckingTest
@@ -82,7 +82,7 @@ add_libc_test(
8282
SRCS
8383
mbstowcs_test.cpp
8484
DEPENDS
85-
libc.src.__support.libc_errno
85+
libc.hdr.errno_macros
8686
libc.src.wchar.mbstowcs
8787
libc.hdr.types.wchar_t
8888
libc.test.UnitTest.ErrnoCheckingTest
@@ -95,7 +95,7 @@ add_libc_test(
9595
SRCS
9696
mblen_test.cpp
9797
DEPENDS
98-
libc.src.__support.libc_errno
98+
libc.hdr.errno_macros
9999
libc.src.wchar.mblen
100100
libc.test.UnitTest.ErrnoCheckingTest
101101
)
@@ -107,7 +107,7 @@ add_libc_test(
107107
SRCS
108108
mbsrtowcs_test.cpp
109109
DEPENDS
110-
libc.src.__support.libc_errno
110+
libc.hdr.errno_macros
111111
libc.src.__support.wchar.mbstate
112112
libc.src.string.memset
113113
libc.src.wchar.mbsrtowcs
@@ -123,7 +123,7 @@ add_libc_test(
123123
SRCS
124124
mbrlen_test.cpp
125125
DEPENDS
126-
libc.src.__support.libc_errno
126+
libc.hdr.errno_macros
127127
libc.src.__support.wchar.mbstate
128128
libc.src.string.memset
129129
libc.src.wchar.mbsrlen
@@ -139,14 +139,14 @@ add_libc_test(
139139
SRCS
140140
mbsnrtowcs_test.cpp
141141
DEPENDS
142-
libc.src.__support.libc_errno
142+
libc.hdr.errno_macros
143143
libc.src.__support.wchar.mbstate
144144
libc.src.string.memset
145145
libc.src.wchar.mbsnrtowcs
146146
libc.hdr.types.mbstate_t
147147
libc.hdr.types.wchar_t
148148
libc.test.UnitTest.ErrnoCheckingTest
149-
)
149+
)
150150

151151
add_libc_test(
152152
mbsinit_test
@@ -179,11 +179,11 @@ add_libc_test(
179179
SRCS
180180
wcrtomb_test.cpp
181181
DEPENDS
182+
libc.hdr.errno_macros
182183
libc.src.wchar.wcrtomb
183184
libc.src.string.memset
184185
libc.hdr.types.wchar_t
185186
libc.hdr.types.mbstate_t
186-
libc.src.__support.libc_errno
187187
libc.src.__support.wchar.mbstate
188188
libc.test.UnitTest.ErrnoCheckingTest
189189
)
@@ -195,6 +195,7 @@ add_libc_test(
195195
SRCS
196196
wctomb_test.cpp
197197
DEPENDS
198+
libc.hdr.errno_macros
198199
libc.src.wchar.wctomb
199200
libc.hdr.types.wchar_t
200201
)
@@ -478,9 +479,9 @@ add_header_library(
478479
HDRS
479480
WcstolTest.h
480481
DEPENDS
482+
libc.hdr.errno_macros
481483
libc.src.__support.CPP.limits
482484
libc.src.__support.CPP.type_traits
483-
libc.src.errno.errno
484485
libc.test.UnitTest.ErrnoCheckingTest
485486
)
486487

@@ -526,4 +527,4 @@ add_libc_test(
526527
DEPENDS
527528
libc.src.wchar.wcstoull
528529
.wcstol_test_support
529-
)
530+
)

libc/test/src/wchar/WcstolTest.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "src/__support/CPP/limits.h"
1011
#include "src/__support/CPP/type_traits.h"
1112
#include "src/__support/macros/properties/architectures.h"

libc/test/src/wchar/mblen_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "src/__support/libc_errno.h"
9+
#include "hdr/errno_macros.h"
1010
#include "src/wchar/mblen.h"
1111
#include "test/UnitTest/ErrnoCheckingTest.h"
1212
#include "test/UnitTest/Test.h"

libc/test/src/wchar/mbrlen_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/wchar_t.h"
10-
#include "src/__support/libc_errno.h"
1111
#include "src/__support/wchar/mbstate.h"
1212
#include "src/string/memset.h"
1313
#include "src/wchar/mbrlen.h"

libc/test/src/wchar/mbrtowc_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/mbstate_t.h"
1011
#include "hdr/types/wchar_t.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/__support/wchar/mbstate.h"
1313
#include "src/string/memset.h"
1414
#include "src/wchar/mbrtowc.h"

libc/test/src/wchar/mbsnrtowcs_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/mbstate_t.h"
1011
#include "hdr/types/wchar_t.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/__support/macros/null_check.h"
1313
#include "src/__support/wchar/mbstate.h"
1414
#include "src/string/memset.h"

libc/test/src/wchar/mbsrtowcs_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/mbstate_t.h"
1011
#include "hdr/types/wchar_t.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/__support/macros/null_check.h"
1313
#include "src/__support/wchar/mbstate.h"
1414
#include "src/string/memset.h"

libc/test/src/wchar/mbstowcs_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/wchar_t.h"
10-
#include "src/__support/libc_errno.h"
1111
#include "src/__support/macros/null_check.h"
1212
#include "src/wchar/mbstowcs.h"
1313
#include "test/UnitTest/ErrnoCheckingTest.h"

libc/test/src/wchar/mbtowc_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/wchar_t.h"
10-
#include "src/__support/libc_errno.h"
1111
#include "src/wchar/mbtowc.h"
1212
#include "test/UnitTest/ErrnoCheckingTest.h"
1313
#include "test/UnitTest/Test.h"

libc/test/src/wchar/wcrtomb_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
910
#include "hdr/types/mbstate_t.h"
1011
#include "hdr/types/wchar_t.h"
11-
#include "src/__support/libc_errno.h"
1212
#include "src/__support/wchar/mbstate.h"
1313
#include "src/string/memset.h"
1414
#include "src/wchar/wcrtomb.h"

0 commit comments

Comments
 (0)