Skip to content

Commit 6b7ba2c

Browse files
jrp2014Adam Wespiser
jrp2014
authored and
Adam Wespiser
committed
Make use of unsafePerformIO safer.
1 parent 3607a86 commit 6b7ba2c

File tree

3 files changed

+310
-1
lines changed

3 files changed

+310
-1
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 168 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
# This GitHub workflow config has been generated by a script via
2+
#
3+
# haskell-ci 'github' '--tests' '--no-benchmarks' 'scheme.cabal'
4+
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
10+
#
11+
# version: 0.13.20210525
12+
#
13+
# REGENDATA ("0.13.20210525",["github","--tests","--no-benchmarks","scheme.cabal"])
14+
#
15+
name: Haskell-CI
16+
on:
17+
- push
18+
- pull_request
19+
jobs:
20+
linux:
21+
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22+
runs-on: ubuntu-18.04
23+
container:
24+
image: buildpack-deps:bionic
25+
continue-on-error: ${{ matrix.allow-failure }}
26+
strategy:
27+
matrix:
28+
include:
29+
- compiler: ghc-8.10.4
30+
allow-failure: false
31+
fail-fast: false
32+
steps:
33+
- name: apt
34+
run: |
35+
apt-get update
36+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
37+
apt-add-repository -y 'ppa:hvr/ghc'
38+
apt-get update
39+
apt-get install -y $CC cabal-install-3.4
40+
env:
41+
CC: ${{ matrix.compiler }}
42+
- name: Set PATH and environment variables
43+
run: |
44+
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
45+
echo "LANG=C.UTF-8" >> $GITHUB_ENV
46+
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
47+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
48+
HCDIR=$(echo "/opt/$CC" | sed 's/-/\//')
49+
HCNAME=ghc
50+
HC=$HCDIR/bin/$HCNAME
51+
echo "HC=$HC" >> $GITHUB_ENV
52+
echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
53+
echo "HADDOCK=$HCDIR/bin/haddock" >> $GITHUB_ENV
54+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
55+
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
56+
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
57+
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
58+
echo "ARG_BENCH=--disable-benchmarks" >> $GITHUB_ENV
59+
echo "HEADHACKAGE=false" >> $GITHUB_ENV
60+
echo "ARG_COMPILER=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
61+
echo "GHCJSARITH=0" >> $GITHUB_ENV
62+
env:
63+
CC: ${{ matrix.compiler }}
64+
- name: env
65+
run: |
66+
env
67+
- name: write cabal config
68+
run: |
69+
mkdir -p $CABAL_DIR
70+
cat >> $CABAL_CONFIG <<EOF
71+
remote-build-reporting: anonymous
72+
write-ghc-environment-files: never
73+
remote-repo-cache: $CABAL_DIR/packages
74+
logs-dir: $CABAL_DIR/logs
75+
world-file: $CABAL_DIR/world
76+
extra-prog-path: $CABAL_DIR/bin
77+
symlink-bindir: $CABAL_DIR/bin
78+
installdir: $CABAL_DIR/bin
79+
build-summary: $CABAL_DIR/logs/build.log
80+
store-dir: $CABAL_DIR/store
81+
install-dirs user
82+
prefix: $CABAL_DIR
83+
repository hackage.haskell.org
84+
url: http://hackage.haskell.org/
85+
EOF
86+
cat $CABAL_CONFIG
87+
- name: versions
88+
run: |
89+
$HC --version || true
90+
$HC --print-project-git-commit-id || true
91+
$CABAL --version || true
92+
- name: update cabal index
93+
run: |
94+
$CABAL v2-update -v
95+
- name: install cabal-plan
96+
run: |
97+
mkdir -p $HOME/.cabal/bin
98+
curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
99+
echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
100+
xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan
101+
rm -f cabal-plan.xz
102+
chmod a+x $HOME/.cabal/bin/cabal-plan
103+
cabal-plan --version
104+
- name: checkout
105+
uses: actions/checkout@v2
106+
with:
107+
path: source
108+
- name: initial cabal.project for sdist
109+
run: |
110+
touch cabal.project
111+
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
112+
cat cabal.project
113+
- name: sdist
114+
run: |
115+
mkdir -p sdist
116+
$CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist
117+
- name: unpack
118+
run: |
119+
mkdir -p unpacked
120+
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
121+
- name: generate cabal.project
122+
run: |
123+
PKGDIR_scheme="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/scheme-[0-9.]*')"
124+
echo "PKGDIR_scheme=${PKGDIR_scheme}" >> $GITHUB_ENV
125+
touch cabal.project
126+
touch cabal.project.local
127+
echo "packages: ${PKGDIR_scheme}" >> cabal.project
128+
echo "package scheme" >> cabal.project
129+
echo " ghc-options: -Werror=missing-methods" >> cabal.project
130+
cat >> cabal.project <<EOF
131+
EOF
132+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(scheme)$/; }' >> cabal.project.local
133+
cat cabal.project
134+
cat cabal.project.local
135+
- name: dump install plan
136+
run: |
137+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
138+
cabal-plan
139+
- name: cache
140+
uses: actions/cache@v2
141+
with:
142+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
143+
path: ~/.cabal/store
144+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
145+
- name: install dependencies
146+
run: |
147+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
148+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all
149+
- name: build w/o tests
150+
run: |
151+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
152+
- name: build
153+
run: |
154+
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always
155+
- name: tests
156+
run: |
157+
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
158+
- name: cabal check
159+
run: |
160+
cd ${PKGDIR_scheme} || false
161+
${CABAL} -vnormal check
162+
- name: haddock
163+
run: |
164+
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
165+
- name: unconstrained build
166+
run: |
167+
rm -f cabal.project.local
168+
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

‎.travis.yml‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
# This Travis job script has been generated by a script via
2+
#
3+
# haskell-ci 'travis' '--tests' '--no-benchmarks' 'scheme.cabal'
4+
#
5+
# To regenerate the script (for example after adjusting tested-with) run
6+
#
7+
# haskell-ci regenerate
8+
#
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
10+
#
11+
# version: 0.13.20210525
12+
#
13+
version: ~> 1.0
14+
language: c
15+
os: linux
16+
dist: bionic
17+
git:
18+
# whether to recursively clone submodules
19+
submodules: false
20+
cache:
21+
directories:
22+
- $HOME/.cabal/packages
23+
- $HOME/.cabal/store
24+
- $HOME/.hlint
25+
before_cache:
26+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
27+
# remove files that are regenerated by 'cabal update'
28+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
29+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
30+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
31+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
32+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
33+
- rm -rfv $CABALHOME/packages/head.hackage
34+
jobs:
35+
include:
36+
- compiler: ghc-8.10.4
37+
addons: {"apt":{"packages":["ghc-8.10.4","cabal-install-3.4"],"sources":[{"key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286","sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main"}]}}
38+
os: linux
39+
before_install:
40+
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
41+
- WITHCOMPILER="-w $HC"
42+
- HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
43+
- HCPKG="$HC-pkg"
44+
- unset CC
45+
- CABAL=/opt/ghc/bin/cabal
46+
- CABALHOME=$HOME/.cabal
47+
- export PATH="$CABALHOME/bin:$PATH"
48+
- TOP=$(pwd)
49+
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
50+
- echo $HCNUMVER
51+
- CABAL="$CABAL -vnormal+nowrap"
52+
- set -o pipefail
53+
- TEST=--enable-tests
54+
- BENCH=--enable-benchmarks
55+
- BENCH=--disable-benchmarks
56+
- HEADHACKAGE=false
57+
- rm -f $CABALHOME/config
58+
- |
59+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
60+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
61+
echo "write-ghc-environment-files: never" >> $CABALHOME/config
62+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
63+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
64+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
65+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
66+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
67+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
68+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
69+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
70+
echo "install-dirs user" >> $CABALHOME/config
71+
echo " prefix: $CABALHOME" >> $CABALHOME/config
72+
echo "repository hackage.haskell.org" >> $CABALHOME/config
73+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
74+
install:
75+
- ${CABAL} --version
76+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
77+
- |
78+
echo "program-default-options" >> $CABALHOME/config
79+
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
80+
- cat $CABALHOME/config
81+
- rm -fv cabal.project cabal.project.local cabal.project.freeze
82+
- travis_retry ${CABAL} v2-update -v
83+
# Generate cabal.project
84+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
85+
- touch cabal.project
86+
- |
87+
echo "packages: ." >> cabal.project
88+
- echo 'package scheme' >> cabal.project
89+
- "echo ' ghc-options: -Werror=missing-methods' >> cabal.project"
90+
- |
91+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(scheme)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
92+
- cat cabal.project || true
93+
- cat cabal.project.local || true
94+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
95+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
96+
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
97+
- rm cabal.project.freeze
98+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
99+
- travis_wait 40 ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
100+
script:
101+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
102+
# Packaging...
103+
- ${CABAL} v2-sdist all
104+
# Unpacking...
105+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
106+
- cd ${DISTDIR} || false
107+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
108+
- find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;
109+
- PKGDIR_scheme="$(find . -maxdepth 1 -type d -regex '.*/scheme-[0-9.]*')"
110+
# Generate cabal.project
111+
- rm -rf cabal.project cabal.project.local cabal.project.freeze
112+
- touch cabal.project
113+
- |
114+
echo "packages: ${PKGDIR_scheme}" >> cabal.project
115+
- echo 'package scheme' >> cabal.project
116+
- "echo ' ghc-options: -Werror=missing-methods' >> cabal.project"
117+
- |
118+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(scheme)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
119+
- cat cabal.project || true
120+
- cat cabal.project.local || true
121+
# Building...
122+
# this builds all libraries and executables (without tests/benchmarks)
123+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
124+
# Building with tests and benchmarks...
125+
# build & run tests, build benchmarks
126+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all --write-ghc-environment-files=always
127+
# Testing...
128+
- ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all --test-show-details=direct
129+
# cabal check...
130+
- (cd ${PKGDIR_scheme} && ${CABAL} -vnormal check)
131+
# haddock...
132+
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
133+
# Building without installed constraints for packages in global-db...
134+
- rm -f cabal.project.local
135+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
136+
137+
# REGENDATA ("0.13.20210525",["travis","--tests","--no-benchmarks","scheme.cabal"])
138+
# EOF

‎test-hs/Spec/Main.hs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE OverloadedStrings #-}
2+
{-# OPTIONS_GHC -fno-cse -fno-full-laziness#-} -- make unsafePerformIO safer
23
module Main (main) where
34

45
import LispVal ( LispVal(String, Nil, Atom, List, Bool, Number) )
@@ -127,12 +128,13 @@ tExpr :: T.Text -> T.Text -> LispVal -> SpecWith ()
127128
tExpr note expr val =
128129
it (T.unpack note) $ evalVal `shouldBe` val
129130
where evalVal = unsafePerformIO $ runASTinEnv basicEnv $ fileToEvalForm "" expr
130-
131+
{-# NOINLINE tExpr #-}
131132

132133
runExpr :: Maybe T.Text -> T.Text -> LispVal -> SpecWith ()
133134
runExpr std file val =
134135
it (T.unpack file) $ evalVal `shouldBe` val
135136
where evalVal = unsafePerformIO $ evalTextTest std file
137+
{-# NOINLINE runExpr #-}
136138

137139
evalTextTest :: Maybe T.Text -> T.Text -> IO LispVal --REPL
138140
evalTextTest (Just stdlib) file= do
@@ -149,6 +151,7 @@ tExprStd :: T.Text -> T.Text -> LispVal -> SpecWith ()
149151
tExprStd note expr val =
150152
it (T.unpack note ) $ evalVal `shouldBe` val
151153
where evalVal = unsafePerformIO $ evalExprTest expr
154+
{-# NOINLINE tExprStd #-}
152155

153156
evalExprTest :: T.Text -> IO LispVal --REPL
154157
evalExprTest expr = do

0 commit comments

Comments
 (0)