Skip to content

Commit 448724b

Browse files
committed
revised attempt at integrated tests
1 parent 4749d40 commit 448724b

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

libdash.opam

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,11 @@ build: [
2727
[make]
2828
[make "install"] # into _build
2929
[make "-C" "ocaml" "all"]
30-
["./mk_dot_install.sh"]
3130
["./ldconfig.sh"] # fix up .so files if ldconfig didn't do it
3231
[make "-C" "ocaml" "test"] {with-test}
3332
]
3433
install: [
35-
["opam-installer" "--prefix=%{prefix}%" "libdash.install"]
34+
["./libdash_install.sh"] # autotools borks if we call it install.sh, lol
3635
[make "-C" "test" "test"] {with-test}
3736
]
3837
dev-repo: "git+https:///github.com/mgree/libdash"
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
1-
#!/bin/sh
1+
#!/bin/bash
22

3-
set -e
3+
set -ex
44

55
libdash_files=$(ls _build/lib)
66
bindings_files="META dash.cmxa dash.cma dash.a dash.mli dash.cmi dash.cmo dash.cmx ast.mli ast.cmi ast.cmo ast.cmx"
77

88
files=
99
for f in ${libdash_files}
1010
do
11-
files="${files} \"_build/lib/${f}\""
11+
files="${files} _build/lib/${f}"
1212
done
1313

1414
for f in ${bindings_files}
1515
do
16-
files="${files} \"ocaml/${f}\""
16+
files="${files} ocaml/${f}"
1717
done
1818

19-
cat >libdash.install <<EOF
20-
lib: [${files} ]
21-
EOF
22-
19+
ocamlfind install libdash -nodll $files

0 commit comments

Comments
 (0)