Skip to content

Commit a6d3c98

Browse files
committed
TEST
1 parent 9576055 commit a6d3c98

File tree

2 files changed

+18
-101
lines changed

2 files changed

+18
-101
lines changed

.appveyor.yml

Lines changed: 4 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -51,112 +51,12 @@ environment:
5151
B2_VARIANT: debug,release
5252

5353
matrix:
54-
- FLAVOR: Visual Studio 2008, 2010, 2012
55-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
56-
B2_TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0
57-
B2_ADDRESS_MODEL: 32 # No 64bit support
58-
59-
- FLAVOR: Visual Studio 2013
60-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
61-
B2_TOOLSET: msvc-12.0
62-
63-
- FLAVOR: Visual Studio 2015
64-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
65-
B2_TOOLSET: msvc-14.0
66-
67-
- FLAVOR: Visual Studio 2017 C++14/17
68-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
69-
B2_CXXSTD: 14,17
70-
B2_TOOLSET: msvc-14.1
71-
72-
- FLAVOR: Visual Studio 2017 C++2a Strict
73-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
74-
B2_CXXFLAGS: -permissive-
75-
B2_CXXSTD: 2a
76-
B2_TOOLSET: msvc-14.1
77-
# The VS2017 image has some issues which we workaround, so collect coverage for that.
78-
COVERAGE: true
79-
80-
- FLAVOR: Visual Studio 2019 C++ 14/17
81-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
82-
B2_CXXFLAGS: -permissive-
83-
B2_CXXSTD: 14,17
84-
B2_TOOLSET: msvc-14.2
85-
86-
- FLAVOR: Visual Studio 2019 C++ 2a
87-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
88-
B2_CXXFLAGS: -permissive-
89-
B2_CXXSTD: 2a
90-
B2_TOOLSET: msvc-14.2
91-
92-
- FLAVOR: Visual Studio 2022 C++ 14/17
93-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
94-
B2_CXXFLAGS: -permissive-
95-
B2_CXXSTD: 14,17
96-
B2_TOOLSET: msvc-14.3
97-
98-
- FLAVOR: Visual Studio 2022 C++20
99-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
100-
B2_CXXFLAGS: -permissive-
101-
B2_CXXSTD: 20
102-
B2_TOOLSET: msvc-14.3
103-
104-
- FLAVOR: clang-cl
105-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
106-
B2_ADDRESS_MODEL: 64
107-
B2_CXXSTD: 11,14,17
108-
B2_TOOLSET: clang-win
109-
110-
- FLAVOR: clang-cl using windows.h
111-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
112-
B2_ADDRESS_MODEL: 64
113-
B2_CXXSTD: 17
114-
B2_TOOLSET: clang-win
115-
B2_DEFINES: BOOST_USE_WINDOWS_H
116-
117-
- FLAVOR: cygwin (32-bit)
118-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
119-
ADDPATH: C:\cygwin\bin;
120-
B2_ADDRESS_MODEL: 32
121-
B2_CXXSTD: 11,14,1z
122-
B2_TOOLSET: gcc
123-
124-
- FLAVOR: cygwin (64-bit)
125-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
126-
ADDPATH: C:\cygwin64\bin;
127-
B2_ADDRESS_MODEL: 64
128-
B2_CXXSTD: 11,14,1z
129-
B2_TOOLSET: gcc
130-
131-
# (Currently) the images up to 2017 use an older Cygwin
132-
# This tests that the library works with more recent versions
13354
- FLAVOR: cygwin (64-bit, latest) C++11
13455
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
13556
ADDPATH: C:\cygwin64\bin;
13657
B2_ADDRESS_MODEL: 64
13758
B2_CXXSTD: 11
13859
B2_TOOLSET: gcc
139-
# Split to avoid 1h timeout for multi-config runs
140-
- FLAVOR: cygwin (64-bit, latest) C++17
141-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
142-
ADDPATH: C:\cygwin64\bin;
143-
B2_ADDRESS_MODEL: 64
144-
B2_CXXSTD: 1z
145-
B2_TOOLSET: gcc
146-
147-
- FLAVOR: mingw64 (32-bit)
148-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
149-
ADDPATH: C:\mingw-w64\i686-8.1.0-posix-dwarf-rt_v6-rev0\mingw32\bin;
150-
B2_ADDRESS_MODEL: 32
151-
B2_CXXSTD: 03,11,14,17,2a
152-
B2_TOOLSET: gcc
153-
154-
- FLAVOR: mingw64
155-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
156-
ADDPATH: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;
157-
B2_ADDRESS_MODEL: 64
158-
B2_CXXSTD: 11,14,17,2a
159-
B2_TOOLSET: gcc
16060

16161
install:
16262
- git clone --depth 1 https://github.com/boostorg/boost-ci.git C:\boost-ci-cloned
@@ -178,3 +78,7 @@ for:
17878
- matrix:
17979
only: [COVERAGE: true]
18080
test_script: [ps: ci\codecov.ps1]
81+
init:
82+
- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
83+
on_finish:
84+
- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

include/boost/locale/generic_codecvt.hpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
#include <boost/locale/utf.hpp>
1212
#include <cstdint>
1313
#include <locale>
14+
#ifdef __CYGWIN__
15+
#include <iostream>
16+
#endif
1417

1518
namespace boost { namespace locale {
1619

@@ -220,9 +223,19 @@ namespace boost { namespace locale {
220223
auto cvt_state = implementation().initial_state(to_unicode_state);
221224
while(to < to_end && from < from_end) {
222225
const char* from_saved = from;
223-
226+
#ifdef __CYGWIN__
227+
std::cout << "Entering IN--------------" << std::endl;
228+
std::cout << "State " << state << std::endl;
229+
std::cout << "Left in " << std::dec << from_end - from << " out " << to_end - to << std::endl;
230+
for(const char* c = from; c != from_end; ++c)
231+
std::cout << std::hex << (int)(unsigned char)*c << " ";
232+
#endif
224233
utf::code_point ch = implementation().to_unicode(cvt_state, from, from_end);
225234

235+
#ifdef __CYGWIN__
236+
std::cout << "Got char " << std::hex << ch << std::dec << std::endl;
237+
#endif
238+
226239
if(ch == boost::locale::utf::illegal) {
227240
from = from_saved;
228241
r = std::codecvt_base::error;

0 commit comments

Comments
 (0)