update tests/manual-intf-c after merging #837

ocaml · Oct 11, 2016 · fcf8bbe · fcf8bbe
1 parent 6c4023d
commit fcf8bbe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/testsuite/tests/manual-intf-c/Makefile b/testsuite/tests/manual-intf-c/Makefile
@@ -19,7 +19,8 @@ default: clean $(SOURCES) $(CSOURCES)
 	@printf " ... testing prog"
 	@$(MAKE) prog > /dev/null && echo " => passed" || echo " => failed"
 	@printf " ... testing prog2"
-	@$(MAKE) prog2 >/dev/null 2>prog2.result || :
+	@$(MAKE) prog2 REDIRECT=">prog2.result 2>&1" \
+	  >/dev/null 2>/dev/null || :
 	@$(DIFF) prog2.reference prog2.result >/dev/null \
 	&& echo " => passed" || echo " => failed"
 
@@ -29,7 +30,7 @@ prog:
 
 # Should fail
 prog2:  curses.cmo
-	$(OCAMLC) -custom -o prog2 $(LIBUNIX) prog.ml $(CSOURCES) $(CLIBS)
+	$(OCAMLC) -custom -o prog2 $(LIBUNIX) prog.ml $(CSOURCES) $(CLIBS) $(REDIRECT)
 
 .PHONY: clean
 clean:

diff --git a/testsuite/tests/manual-intf-c/prog2.reference b/testsuite/tests/manual-intf-c/prog2.reference
@@ -0,0 +1,2 @@
+File "curses_stubs.c", line 1:
+Error: Required module `Curses' is unavailable