The unpac monorepo manager self-hosting as a monorepo using unpac
Merge pull request #14409 from dra27/bish-bash
Refactor the PR14323 test (⇒ fix Jenkins)
authored by
Gabriel Scherer
and committed by
GitHub
2e63e0d9
2d6a35d0
+43
-53
+16
testsuite/tests/lib-dynlink-pr14323/main.ml
+16
testsuite/tests/lib-dynlink-pr14323/main.ml
···
1
+
let () =
2
+
let rec loop failed i =
3
+
if i > 5 then begin
4
+
print_endline "Too many failures.";
5
+
exit 1
6
+
end else
7
+
match Dynlink.loadfile "toto.cmxs" with
8
+
| _ ->
9
+
print_endline "OK";
10
+
exit 0
11
+
| exception exn ->
12
+
if not failed then print_endline "Dynlink.loadfile failed. Retrying.";
13
+
Unix.sleep 1;
14
+
loop true (i + 1)
15
+
in
16
+
loop false 0
+5
-7
testsuite/tests/lib-dynlink-pr14323/test.ml
+5
-7
testsuite/tests/lib-dynlink-pr14323/test.ml
···
1
1
(* TEST
2
2
native-dynlink;
3
3
native-compiler;
4
-
not-windows;
5
-
output = "test.output";
6
-
reference = "${test_source_directory}/test.reference";
7
-
program = "${test_source_directory}/test.sh";
8
-
arguments = "${ocamlsrcdir}";
9
-
run;
10
-
check-program-output;
4
+
readonly_files = "toto.ml main.ml";
5
+
output = "${test_build_directory}/script.output";
6
+
setup-ocamlopt.opt-build-env;
7
+
script = "sh ${test_source_directory}/test.sh";
8
+
script;
11
9
*)
-3
testsuite/tests/lib-dynlink-pr14323/test.reference
-3
testsuite/tests/lib-dynlink-pr14323/test.reference
+20
-43
testsuite/tests/lib-dynlink-pr14323/test.sh
+20
-43
testsuite/tests/lib-dynlink-pr14323/test.sh
···
1
-
#!/usr/bin/env bash
2
-
3
-
set -euo pipefail
4
-
5
-
ocamlsrcdir="$1"
1
+
#!/bin/sh
6
2
7
-
ocamlopt=(
8
-
"$ocamlsrcdir"/ocamlopt.opt
9
-
-nostdlib
10
-
-I "$ocamlsrcdir"/stdlib
11
-
-I "$ocamlsrcdir"/otherlibs/dynlink
12
-
-I "$ocamlsrcdir"/otherlibs/unix
13
-
)
3
+
set -eu
14
4
15
-
ocamlopt="${ocamlopt[@]}"
5
+
ocamlopt () {
6
+
"$ocamlsrcdir"/ocamlopt.opt \
7
+
-nostdlib \
8
+
-I "$ocamlsrcdir"/stdlib \
9
+
-I "$ocamlsrcdir"/otherlibs/dynlink \
10
+
-I "$ocamlsrcdir"/otherlibs/unix \
11
+
"$@"
12
+
}
16
13
17
14
cat >lib.ml <<EOF
18
15
let s = "Hello natdynlink!"
19
16
EOF
20
17
21
-
cat >toto.ml <<EOF
22
-
let () =
23
-
print_endline Lib.s
24
-
EOF
25
-
26
-
cat >main.ml <<EOF
27
-
let () =
28
-
let rec loop failed i =
29
-
if i > 5 then begin
30
-
print_endline "Too many failures.";
31
-
exit 1
32
-
end else
33
-
match Dynlink.loadfile "toto.cmxs" with
34
-
| _ ->
35
-
print_endline "OK";
36
-
exit 0
37
-
| exception exn ->
38
-
if not failed then print_endline "Dynlink.loadfile failed. Retrying.";
39
-
Unix.sleep 1;
40
-
loop true (i + 1)
41
-
in
42
-
loop false 0
43
-
EOF
44
-
45
18
# Build toto.cmxs against the original lib.cmi
46
19
47
-
$ocamlopt -c lib.ml
48
-
$ocamlopt -shared -o toto.cmxs toto.ml
20
+
ocamlopt -c lib.ml
21
+
ocamlopt -shared -o toto.cmxs toto.ml
49
22
50
23
# Update lib.cmi
51
24
52
25
echo 'let x = 42' >>lib.ml
53
-
$ocamlopt -c lib.ml
54
-
$ocamlopt -o main.exe dynlink.cmxa unix.cmxa lib.cmx main.ml
26
+
ocamlopt -c lib.ml
27
+
ocamlopt -o main.exe dynlink.cmxa unix.cmxa lib.cmx main.ml
55
28
56
29
# At this point, toto.cmxs no longer loads as the lib.cmi that has been recorded
57
30
# in main.exe does not match the one used when building toto.cmxs
···
62
35
# Rebuild toto.cmxs against the updated lib.cmi
63
36
64
37
sleep 1
65
-
$ocamlopt -shared -o toto.cmxs toto.ml
38
+
ocamlopt -shared -o toto.cmxs toto.ml
66
39
67
-
wait $PID || :
40
+
if wait $PID; then
41
+
exit ${TEST_PASS}
42
+
else
43
+
exit ${TEST_FAIL}
44
+
fi