From b135374d5e40df21871b3e0c9efc69ba2d8361cb Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 20 Oct 2009 10:50:22 +0200 Subject: Add tests to the distribution The distribution makefiles for tests are automatically generated by the build/dist script. nmakefiles are not yet generated. --- tests/cxx/hybrid/polymorphism/makefile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'tests/cxx/hybrid/polymorphism/makefile') diff --git a/tests/cxx/hybrid/polymorphism/makefile b/tests/cxx/hybrid/polymorphism/makefile index 94bcc89..a1daa54 100644 --- a/tests/cxx/hybrid/polymorphism/makefile +++ b/tests/cxx/hybrid/polymorphism/makefile @@ -5,18 +5,27 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make -tests := +all_tests := multischema + +build_tests := ifeq ($(xsde_iostream),y) -tests += multischema +build_tests += multischema endif default := $(out_base)/ test := $(out_base)/.test +dist := $(out_base)/.dist +dist-win := $(out_base)/.dist-win clean := $(out_base)/.clean -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests))) +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_tests))) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests))) +$(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_tests))) -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) +ifneq ($(filter $(MAKECMDGOALS),dist dist-win),) +$(foreach t,$(all_tests),$(call import,$(src_base)/$t/makefile)) +else +$(foreach t,$(build_tests),$(call import,$(src_base)/$t/makefile)) +endif -- cgit v1.1