Merge pull request #452 from samoht/jbuilder-fixes

Jbuilder fixes
mirage · Jun 5, 2017 · d86350e · d86350e
2 parents 62ba1ad + 4940441
commit d86350e
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ env:
   global:
   - ALCOTEST_SHOW_ERRORS=1
   - REVDEPS="irmin-indexeddb"
-  - PINS="irmin.dev:. irmin-mem.dev:. irmin-fs.dev:. irmin-http.dev:. irmin-git.dev:. irmin-mirage.dev:. irmin-unix.dev:. git.dev:--dev git-http:--dev git-mirage:--dev git-unix:--dev"
+  - PINS="irmin.dev:. irmin-mem.dev:. irmin-fs.dev:. irmin-http.dev:. irmin-git.dev:. irmin-mirage.dev:. irmin-unix.dev:. git.dev:--dev git-http.dev:--dev git-mirage.dev:--dev git-unix.dev:--dev"
   matrix:
   - OCAML_VERSION=4.03 PACKAGE="irmin-fs.dev" TESTS=true
   - OCAML_VERSION=4.04 PACKAGE="irmin-mem.dev" TESTS=true

diff --git a/Makefile b/Makefile
@@ -1,36 +1,10 @@
 BUILD=jbuilder build --dev
-RUNTEST=jbuilder runtest -j 1 --dev
+RUNTEST=jbuilder runtest -j1 --no-buffer --dev
 
 all:
 	$(BUILD)
 	$(RUNTEST)
 
-core:
-	$(BUILD) -p irmin
-
-mem:
-	$(BUILD) -p irmin-mem
-	$(RUNTEST) test/irmin-mem
-
-fs:
-	$(BUILD) -p irmin-fs
-	$(RUNTEST) test/irmin-fs
-
-git:
-	$(BUILD) -p irmin-git
-	$(RUNTEST) test/main_git
-
-http:
-	$(BUILD) -p irmin-http
-	$(RUNTEST) test/main_http
-
-mirage:
-	$(BUILD) -p irmin-mirage
-
-unix:
-	$(BUILD) -p irmin-unix
-	$(RUNTEST) test/main_unix
-
 clean:
 	rm -rf _build
 

diff --git a/irmin-unix.opam b/irmin-unix.opam
@@ -8,7 +8,7 @@ dev-repo:     "https://github.com/mirage/irmin.git"
 doc:          "https://mirage.github.io/irmin/"
 
 build: ["jbuilder" "build" "-p" name "-j" jobs]
-build-test: ["jbuilder" "runtest" "test/irmin-mem"]
+build-test: ["jbuilder" "runtest" "test/irmin-unix"]
 
 depends: [
   "jbuilder"   {build}

diff --git a/test/irmin-fs/jbuild b/test/irmin-fs/jbuild
@@ -8,7 +8,6 @@
 (executable
  ((name      test)
   (modules   (test))
-  (package   irmin-fs)
   (libraries (test_fs))))
 
 (alias

diff --git a/test/irmin-git/jbuild b/test/irmin-git/jbuild
@@ -8,7 +8,6 @@
 (executable
  ((name      test)
   (modules   (test))
-  (package   irmin-git)
   (libraries (test_git))))
 
 (alias

diff --git a/test/irmin-http/jbuild b/test/irmin-http/jbuild
@@ -8,7 +8,6 @@
 (executable
  ((name      test)
   (modules   (test))
-  (package   irmin-htttp)
   (libraries (test_http))))
 
 (alias

diff --git a/test/irmin-mem/jbuild b/test/irmin-mem/jbuild
@@ -8,7 +8,6 @@
 (executable
  ((name      test)
   (modules   (test))
-  (package   irmin-mem)
   (libraries (test_mem))))
 
 (alias

diff --git a/test/irmin-unix/jbuild b/test/irmin-unix/jbuild
@@ -8,7 +8,6 @@
 (executable
  ((name      test)
   (modules   (test))
-  (package   irmin-unix)
   (libraries (test_unix))))
 
 (alias