From 12162e6e7436fc194572bd7ab913611293b67f11 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 22 Feb 2018 21:10:55 +0800
Subject: [PATCH] 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.
---
.travis.yml | 6 ++++--
Spec.hs | 4 ++--
test/asm/aarch64-ios.s | 2 +-
test/asm/aarch64.s | 4 ++--
test/asm/arm-ios.s | 2 +-
test/asm/arm.s | 4 ++--
test/asm/tmp.c | 2 +-
test/asm/x86-linux.s | 4 ++--
test/asm/x86_64-linux.s | 4 ++--
test/asm/x86_64-mac.s | 2 +-
test/asm/x86_64-mingw32.s | 2 +-
11 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 40a132c..dd728a9 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 3727b4f..973e92c 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 0719574..2adeeef 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 54f87e8..227c833 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 99dda73..56b1878 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 8b86b0a..936ef7c 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 31b125b..f08f677 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 0df0139..8808d41 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 3d09972..351196e 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 1edf95e..88a0e08 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 b908fef..031061d 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:
--
GitLab