diff --git a/.travis.yml b/.travis.yml index 40a132c8ce121b747feced1f89500eae45b413e0..dd728a97acef4f9ef6540cd2ab23025e37c38aaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,12 @@ matrix: include: - compiler: "ghc-7.0.4" env: INSTALLED=false - # env: TEST=--disable-tests BENCH=--disable-benchmarks + # can't build the testsuites dependencies with 7.0 + env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.0.4], sources: [hvr-ghc]}} - compiler: "ghc-7.2.2" - # env: TEST=--disable-tests BENCH=--disable-benchmarks + # can't build the testsuites dependencies with 7.2 + env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.2.2], sources: [hvr-ghc]}} - compiler: "ghc-7.4.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks diff --git a/Spec.hs b/Spec.hs index 3727b4fd9d6c9740a7ecf9b7fc66d135674b736a..973e92c91434d655e5224274974264e8e8dfca08 100644 --- a/Spec.hs +++ b/Spec.hs @@ -24,7 +24,7 @@ main = hspec $ do lookupInteger "z" x `shouldBe` (Just (-1)) it "t should be \"Hello World\\\"\\n\\0\"" $ do - lookupString "t" x `shouldBe` (Just "Hello World\"\n\0") + lookupString "t" x `shouldBe` (Just "Hello World\" 12345\0") forM_ [("arm ios", "test/asm/arm-ios.s") ,("arm linux", "test/asm/arm.s") @@ -41,6 +41,6 @@ main = hspec $ do lookupInteger "z" x `shouldBe` (Just (-1)) it "t should be \"Hello World\\\"\\n\\0\"" $ do - lookupString "t" x `shouldBe` (Just "Hello World\"\n\0") + lookupString "t" x `shouldBe` (Just "Hello World\" 12345\0") diff --git a/test/asm/aarch64-ios.s b/test/asm/aarch64-ios.s index 071957423a4948e16c75dd1a09bb63231287df75..2adeeef3ec86873bbca60a6c180e476f2ff8690d 100644 --- a/test/asm/aarch64-ios.s +++ b/test/asm/aarch64-ios.s @@ -32,7 +32,7 @@ _z: .section __TEXT,__cstring,cstring_literals l_.str: ; @.str - .asciz "Hello World\"\n" + .asciz "Hello World\" 12345" .section __DATA,__data .globl _t ; @t diff --git a/test/asm/aarch64.s b/test/asm/aarch64.s index 54f87e8df05eadbbd3bcace683141c7f52e1be09..227c8339fbc95378d0ccc3433ea8b496fd7d7512 100644 --- a/test/asm/aarch64.s +++ b/test/asm/aarch64.s @@ -57,8 +57,8 @@ z: .type .L.str,@object // @.str .section .rodata.str1.1,"aMS",@progbits,1 .L.str: - .asciz "Hello World\"\n" - .size .L.str, 14 + .asciz "Hello World\" 12345" + .size .L.str, 19 .type t,@object // @t .data diff --git a/test/asm/arm-ios.s b/test/asm/arm-ios.s index 99dda733827e85f64f3a59399103eb0df75a6d8a..56b18789c964ce5649223d18ed1a34033e85f6f9 100644 --- a/test/asm/arm-ios.s +++ b/test/asm/arm-ios.s @@ -38,7 +38,7 @@ _z: .section __TEXT,__cstring,cstring_literals L_.str: @ @.str - .asciz "Hello World\"\n" + .asciz "Hello World\" 12345" .section __DATA,__data .globl _t @ @t diff --git a/test/asm/arm.s b/test/asm/arm.s index 8b86b0a3940d2a4ab92c286365755d7228cac3a5..936ef7c40c7d02594b6a33e03f840f2b6869720d 100644 --- a/test/asm/arm.s +++ b/test/asm/arm.s @@ -84,8 +84,8 @@ z: .type .L.str,%object @ @.str .section .rodata.str1.1,"aMS",%progbits,1 .L.str: - .asciz "Hello World\"\n" - .size .L.str, 14 + .asciz "Hello World\" 12345" + .size .L.str, 19 .type t,%object @ @t .data diff --git a/test/asm/tmp.c b/test/asm/tmp.c index 31b125bde76ab44072fc136bc5222a58898ab743..f08f67708e0f97608a1e7c3c4233836af3600e4e 100644 --- a/test/asm/tmp.c +++ b/test/asm/tmp.c @@ -24,4 +24,4 @@ unsigned long long z___hsc2hs_sign___ = Y < 0; unsigned long long z = (unsigned long long)Y; extern char * t; -char * t = "Hello World\"\n"; +char * t = "Hello World\" 12345"; diff --git a/test/asm/x86-linux.s b/test/asm/x86-linux.s index 0df013954261808792553406ef3afef7c22bcb06..8808d41809eebb62b87b3fd92c1d3f6c3c19078a 100644 --- a/test/asm/x86-linux.s +++ b/test/asm/x86-linux.s @@ -57,8 +57,8 @@ z: .type .L.str,@object # @.str .section .rodata.str1.1,"aMS",@progbits,1 .L.str: - .asciz "Hello World\"\n" - .size .L.str, 14 + .asciz "Hello World\" 12345" + .size .L.str, 19 .type t,@object # @t .data diff --git a/test/asm/x86_64-linux.s b/test/asm/x86_64-linux.s index 3d09972d291a0a8a17d0c41e4cec65349563001d..351196ec59fe0d17f016545eec3c8b6d6ae36c0f 100644 --- a/test/asm/x86_64-linux.s +++ b/test/asm/x86_64-linux.s @@ -57,8 +57,8 @@ z: .type .L.str,@object # @.str .section .rodata.str1.1,"aMS",@progbits,1 .L.str: - .asciz "Hello World\"\n" - .size .L.str, 14 + .asciz "Hello World\" 12345" + .size .L.str, 19 .type t,@object # @t .data diff --git a/test/asm/x86_64-mac.s b/test/asm/x86_64-mac.s index 1edf95e3200869c0d27a8b2013278a6a13569310..88a0e08080a8c00c4f1aca52c1dc44c596ba05e3 100644 --- a/test/asm/x86_64-mac.s +++ b/test/asm/x86_64-mac.s @@ -32,7 +32,7 @@ _z: .section __TEXT,__cstring,cstring_literals L_.str: ## @.str - .asciz "Hello World\"\n" + .asciz "Hello World\" 12345" .section __DATA,__data .globl _t ## @t diff --git a/test/asm/x86_64-mingw32.s b/test/asm/x86_64-mingw32.s index b908fef61b7d1dfc7d47a215cf5897136d0b3154..031061da36f1f7c17c415478126a16f2eecbbf85 100644 --- a/test/asm/x86_64-mingw32.s +++ b/test/asm/x86_64-mingw32.s @@ -36,7 +36,7 @@ z: .globl t .section .rdata,"dr" .LC0: - .ascii "Hello World\"\12\0" + .ascii "Hello World\" 12345\0" .data .align 8 t: