diff options
| author | Xavier Clerc <xavier.clerc@inria.fr> | 2010-05-05 09:45:49 +0000 |
|---|---|---|
| committer | Xavier Clerc <xavier.clerc@inria.fr> | 2010-05-05 09:45:49 +0000 |
| commit | 458d066ec12c41a918d440263627acc7484c09f9 (patch) | |
| tree | 488212f641380f1ea17d5ec54a1172b8a809b0a0 | |
| parent | 027bbf8ecb8a3fd2e25d97886d9801697ece15a1 (diff) | |
| download | ocaml-458d066ec12c41a918d440263627acc7484c09f9.tar.gz | |
Fortran-related test now disabled by default.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10372 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | testsuite/makefiles/Makefile.common | 4 | ||||
| -rw-r--r-- | testsuite/makefiles/Makefile.several | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/makefiles/Makefile.common b/testsuite/makefiles/Makefile.common index da3ac643c2..a1abd1aab8 100644 --- a/testsuite/makefiles/Makefile.common +++ b/testsuite/makefiles/Makefile.common @@ -16,8 +16,8 @@ OCAMLYACC=$(TOPDIR)/yacc/ocamlyacc$(EXE) OCAMLBUILD=$(TOPDIR)/_build/ocamlbuild/ocamlbuild.native DUMPOBJ=$(OCAMLRUN) $(TOPDIR)/tool/dumpobj$(EXE) #COMPFLAGS= -FORTRAN_COMPILER=/sw/bin/gcc -FORTRAN_LIBRARY=/sw/lib/gcc4.3/lib/libgfortran.a +#FORTRAN_COMPILER= +#FORTRAN_LIBRARY= defaultclean: @rm -f *.cmo *.cmi *.cmx *.cma *.cmxa *.cmxs *.$(O) *.$(SO) *.$(A) diff --git a/testsuite/makefiles/Makefile.several b/testsuite/makefiles/Makefile.several index 6301e4cbe6..099251321f 100644 --- a/testsuite/makefiles/Makefile.several +++ b/testsuite/makefiles/Makefile.several @@ -14,6 +14,9 @@ FORTRAN_LIB=`if [ -z "$(F_FILES)" ]; then true; else echo '$(FORTRAN_LIBRARY)'; ADD_CFLAGS+=$(FORTRAN_LIB) ADD_OPTFLAGS+=$(FORTRAN_LIB) +check: + @if [ -n "$(FORTRAN_COMPILER)" -o -z "$(F_FILES)" ]; then $(MAKE) run-all; fi + run-all: @for file in $(C_FILES); do \ $(CC) -c -I$(PREFIX)/lib/ocaml/caml $$file.c; \ |