In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/c2167943161b3433eff239edc775830289f9936e?hp=aa130681407c1d5203e77f635a297101dd0f2aed>
- Log -----------------------------------------------------------------
commit c2167943161b3433eff239edc775830289f9936e
Author: Tony Cook <t...@develop-help.com>
Date: Mon Oct 22 09:44:57 2018 +1100
(perl #133604) skip a new test on Win32 that fails only on Win32
9704d779 added tests for the apparently completely untested behaviour
of recv() and send() on handles marked as :utf8.
On Win32 the binmode calls used to strip :utf8 for further testing
don't remote :utf8, and the following calls to send() and recv() die.
Hopefully this patch will be reverted soon once binmode is fixed.
-----------------------------------------------------------------------
Summary of changes:
regcomp.c | 7 ++++---
t/io/socket.t | 2 ++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/regcomp.c b/regcomp.c
index b9a5b5cd24..105059f532 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -965,6 +965,7 @@ static const scan_data_t zero_scan_data = {
#define Set_Node_Offset_Length(node,offset,len)
#define ProgLen(ri) ri->u.proglen
#define SetProgLen(ri,x) ri->u.proglen = x
+#define Track_Code(code)
#else
#define ProgLen(ri) ri->u.offsets[0]
#define SetProgLen(ri,x) ri->u.offsets[0] = x
@@ -1007,6 +1008,8 @@ static const scan_data_t zero_scan_data = {
Set_Node_Offset_To_R(REGNODE_OFFSET(node), (offset)); \
Set_Node_Length_To_R(REGNODE_OFFSET(node), (len)); \
} STMT_END
+
+#define Track_Code(code) STMT_START { code } STMT_END
#endif
#if PERL_ENABLE_EXPERIMENTAL_REGEX_OPTIMISATIONS
@@ -3603,9 +3606,7 @@ S_make_trie(pTHX_ RExC_state_t *pRExC_state, regnode
*startbranch,
optimisation.
*/
while( optimize < jumper ) {
-#ifdef RE_TRACK_PATTERN_OFFSETS
- mjd_nodelen += Node_Length((optimize));
-#endif
+ Track_Code( mjd_nodelen += Node_Length((optimize)); );
OP( optimize ) = OPTIMIZED;
Set_Node_Offset_Length(optimize, 0, 0);
optimize++;
diff --git a/t/io/socket.t b/t/io/socket.t
index be3abc0e1e..10c9ef3b26 100644
--- a/t/io/socket.t
+++ b/t/io/socket.t
@@ -141,6 +141,8 @@ SKIP: {
# separate to avoid interfering with the data expected above
$local or skip("No localhost", 1);
$fork or skip("No fork", 1);
+ $^O eq "MSWin32"
+ and skip("binmode acting strangely here on Win32", 1);
note "recv/send :utf8 tests";
ok(socket(my $serv, PF_INET, SOCK_STREAM, $tcp), "make a tcp socket
(recv/send :utf8 handling)");
--
Perl5 Master Repository
