Skip to content
Browse files

[tests] Fix test-cases for ocaml 4.00.0

  • Loading branch information...
1 parent c58504d commit 100cfc4d2d8684101f8ef898baf274e71ba9f5b1 @samoht samoht committed Sep 18, 2012
View
17 tests/Makefile
@@ -200,29 +200,20 @@ switch-alias:
$(OPAM) switch -install test -alias-of system -no-base-packages
$(OPAM) switch -clone system
$(CHECK) -l switch-alias-clone P1.1 P2.1
- $(OPAM) switch -install test2 -alias-of 4.00.0
+ $(OPAM) switch -install test2 -alias-of 20
$(OPAM) install P1
- $(CHECK) -l switch-alias-4.00 P1.1
+ $(CHECK) -l switch-alias-20 P1.1
$(OPAM) switch system
$(OPAM) switch -remove test test2
switch-env-packages:
- $(OPAM) switch 3.12.1
+ $(OPAM) switch 10
ifeq ($(REPOKIND), git)
$(CHECK) -l switch-env-packages P1.1 P2.1 P3.1~weird-version.test P4.3
else
$(CHECK) -l switch-env-packages P1.2 P2.1 P3.1~weird-version.test P4.3
endif
- ./test-TEST.sh $(OPAM_ROOT)/3.12.1/build/P4.3/P4.env "1"
-
-switch:
- $(MAKE) fresh
- $(MAKE) binaries
- $(MAKE) init
- $(MAKE) upload
- $(MAKE) install
- $(OPAM) switch -list
- $(OPAM) switch -clone 3.12.1-byte
+ ./test-TEST.sh $(OPAM_ROOT)/10/build/P4.3/P4.env "1"
packages/%.tar.gz: packages/% packages/%/*
cd packages && tar cz $* > $*.tar.gz
View
0 tests/compilers/3.12.1.comp → tests/compilers/10.comp
File renamed without changes.
View
0 tests/compilers/4.00.0.comp → tests/compilers/20.comp
File renamed without changes.
View
4 tests/compilers/3.12.1-byte.comp
@@ -1,4 +0,0 @@
-opam-version: "1"
-name: "3.12.1-byte"
-src: "http://caml.inria.fr/pub/distrib/ocaml-3.12/ocaml-3.12.1.tar.gz"
-make: [ "world" ]
View
2 tests/packages/P1-2.opam
@@ -1,7 +1,7 @@
opam-version: "1"
name: "P1"
version: "2"
-ocaml-version: [ < "4.00.0" ]
+ocaml-version: [ < "20" ]
maintainer: "contact@ocamlpro.com"
substs: [ "P1.config" ]
libraries: [ "p1" ]

0 comments on commit 100cfc4

Please sign in to comment.
Something went wrong with that request. Please try again.