Update travis.yml and tests

update travis.yml to not try to build the testsuite on 7.0 and 7.2
which won't work, because the dependencies 'call-stack' depends
on base >= 4.5, which is a dependency of hspec-core.

Also updates the assembly files, to drop the `\n` test, which might
end up as `\12`, as `\12`, `\x0a` and `\n`, testing this properly
would require some form of normalization, which we don't have yet.
parent 26161c31
......@@ -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
......
......@@ -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")
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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";
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment