summaryrefslogtreecommitdiff
path: root/testsuite/tests
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez@gmail.com>2019-03-01 14:28:33 +0100
committerGitHub <noreply@github.com>2019-03-01 14:28:33 +0100
commitd0e04baaa85d94402c7a62c8e8e39e940de487d5 (patch)
tree1898416efe90310d95cb7f0aa3e7ef36a312aa98 /testsuite/tests
parent251528537c4d9b7b95589cb6f88e7f0a0d4aaa02 (diff)
parent6606786ba195f6cf38fb3980dda59f1b068a5184 (diff)
downloadocaml-d0e04baaa85d94402c7a62c8e8e39e940de487d5.tar.gz
Merge pull request #2275 from dra27/fix-no-shared-libs-4.08
4.08 version of GPR#2160
Diffstat (limited to 'testsuite/tests')
-rw-r--r--testsuite/tests/tool-caml-tex/ellipses.ml5
-rw-r--r--testsuite/tests/tool-caml-tex/ellipses.reference5
-rw-r--r--testsuite/tests/tool-caml-tex/redirections.ml10
-rw-r--r--testsuite/tests/tool-caml-tex/redirections.reference10
4 files changed, 22 insertions, 8 deletions
diff --git a/testsuite/tests/tool-caml-tex/ellipses.ml b/testsuite/tests/tool-caml-tex/ellipses.ml
index f83df27f76..474873a027 100644
--- a/testsuite/tests/tool-caml-tex/ellipses.ml
+++ b/testsuite/tests/tool-caml-tex/ellipses.ml
@@ -5,8 +5,9 @@
-repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
* hasstr
** native-compiler
- *** script with unix,str
- **** check-program-output
+ *** shared-libraries
+ **** script with unix,str
+ ***** check-program-output
*)
\begin{caml_example*}{verbatim}
diff --git a/testsuite/tests/tool-caml-tex/ellipses.reference b/testsuite/tests/tool-caml-tex/ellipses.reference
index 1503c845df..b4c4ccb06b 100644
--- a/testsuite/tests/tool-caml-tex/ellipses.reference
+++ b/testsuite/tests/tool-caml-tex/ellipses.reference
@@ -5,8 +5,9 @@
-repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
* hasstr
** native-compiler
- *** script with unix,str
- **** check-program-output
+ *** shared-libraries
+ **** script with unix,str
+ ***** check-program-output
*)
\camlexample{verbatim}
diff --git a/testsuite/tests/tool-caml-tex/redirections.ml b/testsuite/tests/tool-caml-tex/redirections.ml
index 80ef43a3f6..1e2fe99207 100644
--- a/testsuite/tests/tool-caml-tex/redirections.ml
+++ b/testsuite/tests/tool-caml-tex/redirections.ml
@@ -5,8 +5,14 @@
-repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
* hasstr
** native-compiler
- *** script with unix,str
- **** check-program-output
+ *** shared-libraries
+ **** script with unix,str
+ ***** check-program-output
+ *** no-shared-libraries
+ **** script with unix,str
+ script = "${ocamlsrcdir}/tools/caml-tex \
+ -repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
+ ***** check-program-output
*)
\begin{caml_example}{toplevel}
diff --git a/testsuite/tests/tool-caml-tex/redirections.reference b/testsuite/tests/tool-caml-tex/redirections.reference
index a9c8603374..242209c73d 100644
--- a/testsuite/tests/tool-caml-tex/redirections.reference
+++ b/testsuite/tests/tool-caml-tex/redirections.reference
@@ -5,8 +5,14 @@
-repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
* hasstr
** native-compiler
- *** script with unix,str
- **** check-program-output
+ *** shared-libraries
+ **** script with unix,str
+ ***** check-program-output
+ *** no-shared-libraries
+ **** script with unix,str
+ script = "${ocamlsrcdir}/tools/caml-tex \
+ -repo-root ${ocamlsrcdir} ${test_source_directory}/${test_file} -o ${output}"
+ ***** check-program-output
*)
\camlexample{toplevel}