M smoke-tests/success/simple-output/expected/build/debug/foo/Makefile +0 -2
@@ 34,6 34,4 @@ profile: all
include ../../../Ocamlrules.mk.in
-$(native_cmx) $(byte_cmo) $(neutral_cmi): ../../../pds.conf
-
-include .d
M smoke-tests/success/simple-output/expected/build/profile/foo/Makefile +0 -2
@@ 34,6 34,4 @@ profile: all
include ../../../Ocamlrules.mk.in
-$(native_cmx) $(byte_cmo) $(neutral_cmi): ../../../pds.conf
-
-include .d
M smoke-tests/success/simple-output/expected/build/release/foo/Makefile +0 -2
@@ 34,6 34,4 @@ profile: all
include ../../../Ocamlrules.mk.in
-$(native_cmx) $(byte_cmo) $(neutral_cmi): ../../../pds.conf
-
-include .d
M smoke-tests/success/simple-output/expected/pds.mk +42 -27
@@ 1,57 1,68 @@
.PHONY: all test clean docs
-.PHONY: $(projects_release) $(projects_debug) $(projects_profile)
+.PHONY: $(projects_release)
+.PHONY: $(projects_clean_release)
+.PHONY: $(tests_release)
+.PHONY: $(tests_clean_release)
+.PHONY: $(projects_debug)
+.PHONY: $(projects_clean_debug)
+.PHONY: $(tests_debug)
+.PHONY: $(tests_clean_debug)
+.PHONY: $(projects_profile)
+.PHONY: $(projects_clean_profile)
+.PHONY: $(tests_profile)
+.PHONY: $(tests_clean_profile)
.PHONY: $(projects_install) $(projects_doc)
-.PHONY: $(tests_release) $(tests_debug) $(tests_profile)
-.PHONY: $(projects_clean_release) $(projects_clean_debug) $(projects_clean_profile)
-.PHONY: $(tests_clean_release) $(tests_clean_debug) $(tests_clean_profile)
RELEASE_PROJECTS=foo
+RELEASE_TESTS=
DEBUG_PROJECTS=foo
+DEBUG_TESTS=
PROFILE_PROJECTS=foo
-
-RELEASE_TESTS=
-DEBUG_TESTS=
PROFILE_TESTS=
projects_release = $(RELEASE_PROJECTS:%=release_%)
+projects_clean_release = $(RELEASE_PROJECTS:%=clean-release_%)
projects_debug = $(DEBUG_PROJECTS:%=debug_%)
+projects_clean_debug = $(DEBUG_PROJECTS:%=clean-debug_%)
projects_profile = $(PROFILE_PROJECTS:%=profile_%)
+projects_clean_profile = $(PROFILE_PROJECTS:%=clean-profile_%)
+
projects_install = $(RELEASE_PROJECTS:%=install_%)
projects_docs = $(RELEASE_PROJECTS:%=docs_%)
projects_remove = $(RELEASE_PROJECTS:%=remove_%)
-projects_clean_release = $(RELEASE_PROJECTS:%=clean-release_%)
-projects_clean_debug = $(DEBUG_PROJECTS:%=clean-debug_%)
-projects_clean_profile = $(PROFILE_PROJECTS:%=clean-profile_%)
tests_release = $(RELEASE_TESTS:%=test-release_%)
+tests_clean_release = $(RELEASE_TESTS:%=test-clean-release_%)
tests_debug = $(DEBUG_TESTS:%=test-debug_%)
+tests_clean_debug = $(DEBUG_TESTS:%=test-clean-debug_%)
tests_profile = $(PROFILE_TESTS:%=test-profile_%)
-tests_clean_release = $(RELEASE_TESTS:%=test-clean-release_%)
-tests_clean_debug = $(DEBUG_TESTS:%=test-clean-debug_%)
tests_clean_profile = $(PROFILE_TESTS:%=test-clean-profile_%)
all: release
+release: $(projects_release)
+
release_foo:
-debug_foo:
-
-profile_foo:
-
-release: $(projects_release)
+test-release: $(tests_release)
debug: $(projects_debug)
-profile: $(projects_profile)
-
-install: $(projects_install)
-
-test: $(tests_release)
+debug_foo:
test-debug: $(tests_debug)
+profile: $(projects_profile)
+
+profile_foo:
+
test-profile: $(tests_profile)
+
+test: test-release
+
+install: $(projects_install)
+
docs: $(projects_docs)
remove: $(projects_remove)
@@ 59,15 70,15 @@ remove: $(projects_remove)
clean:
-rm -rf build/docs
-clean: $(projects_clean_release) $(projects_clean_debug) $(projects_clean_profile)
+clean: $(projects_clean_release) $(projects_clean_debug) $(projects_clean_profile)
-clean: $(tests_clean_release) $(tests_clean_debug) $(tests_clean_profile)
+clean: $(tests_clean_release) $(tests_clean_debug) $(tests_clean_profile)
$(projects_release):
$(MAKE) \
OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
BUILD_DIR=$(shell pwd)/build/release/$(patsubst release_%,%,$@) \
- -C build/release/$(patsubst release_%,%,$@)
+ -C build/release/$(patsubst release_%,%,$@) release
$(projects_debug):
$(MAKE) \
@@ 81,19 92,20 @@ clean: $(tests_clean_release) $(tests_cl
BUILD_DIR=$(shell pwd)/build/profile/$(patsubst profile_%,%,$@) \
-C build/profile/$(patsubst profile_%,%,$@) profile
+
$(projects_install): $(projects_release)
$(MAKE) -C build/release/$(patsubst install_%,%,$@) install
$(tests_release):
$(MAKE) \
OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
- BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst profile_%,%,$@) \
+ BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst release_%,%,$@) \
-C build/test-release/$(patsubst test-release_%,%,$@)
$(tests_debug):
$(MAKE) \
OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
- BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst profile_%,%,$@) \
+ BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst debug_%,%,$@) \
-C build/test-debug/$(patsubst test-debug_%,%,$@)
$(tests_profile):
@@ 102,6 114,7 @@ clean: $(tests_clean_release) $(tests_cl
BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst profile_%,%,$@) \
-C build/test-profile/$(patsubst test-profile_%,%,$@)
+
$(projects_docs): $(projects_release)
mkdir -p $(shell pwd)/build/docs/$(patsubst docs_%,%,$@)
$(MAKE) \
@@ 130,6 143,7 @@ clean: $(tests_clean_release) $(tests_cl
BUILD_DIR=$(shell pwd)/build/profile/$(patsubst clean-profile_%,%,$@) \
-C build/profile/$(patsubst clean-profile_%,%,$@) clean
+
$(tests_clean_release):
$(MAKE) \
OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
@@ 147,3 161,4 @@ clean: $(tests_clean_release) $(tests_cl
OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst test-clean-profile_%,%,$@) \
-C build/test-profile/$(patsubst test-clean-profile_%,%,$@) test-clean
+
M smoke-tests/success/simple-selector-both-formatted/expected/output +1 -1
@@ 1,2 1,2 @@
+src zoom library ocaml bye
src foo library ocaml hi
-src zoom library ocaml bye
R smoke-tests/success/simple-selector-tests-do-not-build-formatted/src/.ignore_me_because_git => +0 -0
R smoke-tests/success/simple-selector-tests-formatted/src/.ignore_me_because_git => +0 -0
M smoke-tests/test +1 -1
@@ 21,7 21,7 @@ for test in success/*; do
echo "Testing $test_name"
mkdir -p "$tmp_dir/$test_name"
set +e
- env MAKE="${MAKE}" ./test "$tmp_dir/$test_name" && diff -r "$tmp_dir/$test_name" expected
+ env MAKE="${MAKE}" ./test "$tmp_dir/$test_name" && diff -x 'pds\.db' -r "$tmp_dir/$test_name" expected
if [[ "$?" -eq 0 ]]; then
echo "ok ${test_count} ${test_name}" >> ../../../build/release/pds/smoke_tests.tap
else