Permalink
Browse files

[tests] make tests should test all the backends

Renames the test targets to reflect the backend they are testing.
make test runs the test for the 3 bakends (rsync, git & server)
  • Loading branch information...
1 parent c6c2c84 commit ec59f94f1c06bd5f97bf66aac6ca4bb0ed9ab9ec @samoht samoht committed May 30, 2012
Showing with 16 additions and 6 deletions.
  1. +6 −2 Makefile
  2. +10 −4 tests/Makefile
View
@@ -48,9 +48,13 @@ distclean: clean
rm -rf _obuild _build
$(MAKE) -C $(SRC_EXT) distclean
-.PHONY: tests tests-server
+.PHONY: tests
+
tests:
- $(MAKE) -C tests
+ $(MAKE) -C tests all
+
+tests-rsync:
+ $(MAKE) -C tests rsync
tests-server:
$(MAKE) -C tests server
View
@@ -28,9 +28,12 @@ BINARIES_ = $(BINARIES:%=$(BIN)/%)
BUILDS = $(foreach bin, $(BINARIES), ../_obuild/$(bin)/$(bin).asm)
ARCHIVES = $(PACKAGES:%=packages/%.tar.gz)
-.PHONY: fresh init upload list install upload-new upgrade downgrade remove switch
+.PHONY: all rsync server git
-all:
+all: rsync server git
+ @
+
+run:
$(MAKE) fresh && \
$(MAKE) binaries && \
$(MAKE) init && \
@@ -47,16 +50,19 @@ all:
$(MAKE) downgrade && \
$(MAKE) list
+rsync:
+ $(MAKE) REPOKIND=rsync run
+
server:
$(MAKE) fresh
$(MAKE) binaries
rm -rf $(OPAM_SERVER_ROOT)
($(ENV) opam-server --root $(OPAM_SERVER_ROOT) & \
- (sleep 1 && $(MAKE) REPOKIND=server OPAM_REPO=$(OPAM_SERVER) all \
+ (sleep 1 && $(MAKE) REPOKIND=server OPAM_REPO=$(OPAM_SERVER) run \
&& killall opam-server || killall opam-server))
git:
- $(MAKE) REPOKIND=git all
+ $(MAKE) REPOKIND=git run
$(BINARIES_): $(BUILDS)
mkdir -p $(BIN)

0 comments on commit ec59f94

Please sign in to comment.