From: gregor herrmann <gregoa@debian.org>
Date: Mon, 28 Jul 2014 14:31:40 +0000 (+0200)
Subject: Imported Upstream version 3.001.005
X-Git-Tag: archive/raspbian/4.017+ds-1+rpi1~1^2~3^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d9411fc06f9c4e913279f8b68b2bb168fe7842bc;p=libsereal-encoder-perl.git

Imported Upstream version 3.001.005
---

diff --git a/Changes b/Changes
index fca4f6e..012aff8 100644
--- a/Changes
+++ b/Changes
@@ -3,6 +3,9 @@ Revision history for Perl extension Sereal-Encoder
 * Warning: For a seamless upgrade, upgrade to version 3
 *          of the decoder before upgrading to version 3 of the
 *          encoder!
+3.001_005 Mon, July 28 2014
+  - Fixup how MakeMaker runs the tests.
+
 3.001_004 Sun, July 27 2014
   - Rework bulk tests so that tests are grouped by options and version
   - Fixups for non-x86 architectures.
diff --git a/META.json b/META.json
index 73ec5f6..4e4ea9b 100644
--- a/META.json
+++ b/META.json
@@ -55,5 +55,5 @@
          "url" : "git://github.com/Sereal/Sereal.git"
       }
    },
-   "version" : "3.001_004"
+   "version" : "3.001_005"
 }
diff --git a/META.yml b/META.yml
index c70f07d..eed72e1 100644
--- a/META.yml
+++ b/META.yml
@@ -32,4 +32,4 @@ requires:
 resources:
   bugtracker: https://github.com/Sereal/Sereal/issues
   repository: git://github.com/Sereal/Sereal.git
-version: 3.001_004
+version: 3.001_005
diff --git a/Makefile.PL b/Makefile.PL
index 0623e0d..f4fab2a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -100,7 +100,7 @@ WriteMakefile1(
     OPTIMIZE          => $OPTIMIZE,
     OBJECT            => '$(O_FILES)',
     test              => {
-        RECURSIVE_TEST_FILES =>  1
+        TESTS => "t/*.t t/*/*/*.t",
     },
 );
 $ENV{OPTIMIZE} = $OPTIMIZE;
diff --git a/lib/Sereal/Encoder.pm b/lib/Sereal/Encoder.pm
index fcdf786..0a377d5 100644
--- a/lib/Sereal/Encoder.pm
+++ b/lib/Sereal/Encoder.pm
@@ -5,7 +5,7 @@ use warnings;
 use Carp qw/croak/;
 use XSLoader;
 
-our $VERSION = '3.001_004'; # Don't forget to update the TestCompat set for testing against installed decoders!
+our $VERSION = '3.001_005'; # Don't forget to update the TestCompat set for testing against installed decoders!
 our $XS_VERSION = $VERSION; $VERSION= eval $VERSION;
 
 # not for public consumption, just for testing.
diff --git a/snappy/csnappy_internal_userspace.h b/snappy/csnappy_internal_userspace.h
index 33eaf3b..47e54ba 100644
--- a/snappy/csnappy_internal_userspace.h
+++ b/snappy/csnappy_internal_userspace.h
@@ -189,11 +189,21 @@ Albert Lee
 #define int32_t int
 #define int16_t short
 
+#define __SNAPPY_STRICT_ALIGN
+
 #elif defined(__s390x__) || defined(__zarch__) || defined(__SYSC_ZARCH__)
 
+#ifndef __BIG_ENDIAN
 #define __BIG_ENDIAN    87654321
+#endif
+#ifndef __LITTLE_ENDIAN
 #define __LITTLE_ENDIAN 12345678
+#endif
+#ifndef __BYTE_ORDER
 #define __BYTE_ORDER __BIG_ENDIAN
+#endif
+
+#define __SNAPPY_STRICT_ALIGN
 
 #endif
 
@@ -269,7 +279,7 @@ static INLINE void UNALIGNED_STORE64(void *p, uint64_t v)
 	ptr->x = v;
 }
 
-#elif defined(__hpux) || defined(__sparc) || defined(__sparc__) /* strict architectures */
+#elif defined(__SNAPPY_STRICT_ALIGN) || defined(__sparc) || defined(__sparc__) /* strict architectures */
 
 /* For these platforms, there really are no unaligned loads/stores.
  * Read/write everything as uint8_t. Smart compilers might recognize
diff --git a/t/lib/Sereal/TestSet.pm b/t/lib/Sereal/TestSet.pm
index 1c53ec3..283bd4a 100644
--- a/t/lib/Sereal/TestSet.pm
+++ b/t/lib/Sereal/TestSet.pm
@@ -619,11 +619,13 @@ our @ScalarRoundtripTests = (
     ["short ascii string", "fooo"],
     ["short latin1 string", "Müller"],
     ["short utf8 string", do {use utf8; " עדיין ח"}],
-    ["long ascii string", do{"abc" x 1000}],
-    ["long latin1 string", "üll" x 1000],
-    ["long utf8 string", do {use utf8; " עדיין חשב" x 1000}],
-    ["long utf8 string with only ascii", do {use utf8; "foo" x 1000}],
-    ["long utf8 string with only latin1 subset", do {use utf8; "üll" x 1000}],
+
+    ["long ascii string", do{"abc" x 10000}],
+    ["long latin1 string", "üll" x 10000],
+    ["long utf8 string", do {use utf8; " עדיין חשב" x 10000}],
+    ["long utf8 string with only ascii", do {use utf8; "foo" x 10000}],
+    ["long utf8 string with only latin1 subset", do {use utf8; "üll" x 10000}],
+
     ["simple regexp", qr/foo/],
     ["regexp with inline modifiers", qr/(?i-xsm:foo)/],
     ["regexp with modifiers", qr/foo/i],
@@ -686,7 +688,9 @@ our @RoundtripTests = (
     (map {["nested scalar ref to " . $_->[0], (\\($_->[1]))]} @ScalarRoundtripTests),
     (map {["array ref to " . $_->[0], ([$_->[1]])]} @ScalarRoundtripTests),
     (map {["hash ref to " . $_->[0], ({foo => $_->[1]})]} @ScalarRoundtripTests),
+    # ---
     (map {["array ref to duplicate " . $_->[0], ([$_->[1], $_->[1]])]} @ScalarRoundtripTests),
+    # ---
     (map {["array ref to aliases " . $_->[0], (sub {\@_}->($_->[1], $_->[1]))]} @ScalarRoundtripTests),
     (map {["array ref to scalar refs to same " . $_->[0], ([\($_->[1]), \($_->[1])])]} @ScalarRoundtripTests),
 );