diff options
Diffstat (limited to 'tests/container')
-rw-r--r-- | tests/container/makefile | 17 | ||||
-rw-r--r-- | tests/container/multi-index/buildfile | 1 | ||||
-rw-r--r-- | tests/container/multi-index/driver.cxx | 7 | ||||
-rw-r--r-- | tests/container/multi-index/makefile | 69 |
4 files changed, 4 insertions, 90 deletions
diff --git a/tests/container/makefile b/tests/container/makefile deleted file mode 100644 index e8c5dc1..0000000 --- a/tests/container/makefile +++ /dev/null @@ -1,17 +0,0 @@ -# file : tests/container/makefile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make - -tests := multi-index - -default := $(out_base)/ -test := $(out_base)/.test -clean := $(out_base)/.clean - -$(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(tests))) -$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(tests))) - -$(foreach t,$(tests),$(call import,$(src_base)/$t/makefile)) diff --git a/tests/container/multi-index/buildfile b/tests/container/multi-index/buildfile index ffc2068..eb42a73 100644 --- a/tests/container/multi-index/buildfile +++ b/tests/container/multi-index/buildfile @@ -1,5 +1,4 @@ # file : tests/container/multi-index/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : MIT; see accompanying LICENSE file import libs = libcutl%lib{cutl} diff --git a/tests/container/multi-index/driver.cxx b/tests/container/multi-index/driver.cxx index 9156366..0fc642a 100644 --- a/tests/container/multi-index/driver.cxx +++ b/tests/container/multi-index/driver.cxx @@ -1,14 +1,15 @@ // file : tests/container/multi-index/driver.cxx -// copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC // license : MIT; see accompanying LICENSE file #include <map> #include <list> #include <string> -#include <cassert> #include <iostream> -#include <cutl/container/multi-index.hxx> +#include <libcutl/container/multi-index.hxx> + +#undef NDEBUG +#include <cassert> using namespace std; using namespace cutl::container; diff --git a/tests/container/multi-index/makefile b/tests/container/multi-index/makefile deleted file mode 100644 index 1ed7e26..0000000 --- a/tests/container/multi-index/makefile +++ /dev/null @@ -1,69 +0,0 @@ -# file : tests/container/multi-index/makefile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC -# license : MIT; see accompanying LICENSE file - -include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make - -cxx_tun := driver.cxx - -# -# -cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) -cxx_od := $(cxx_obj:.o=.o.d) - -cutl.l := $(out_root)/cutl/cutl.l -cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options - -driver := $(out_base)/driver -test := $(out_base)/.test -clean := $(out_base)/.clean - -# Build. -# -$(driver): $(cxx_obj) $(cutl.l) -$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options) - - -$(call include-dep,$(cxx_od)) - - -# Alias for default target. -# -$(out_base)/: $(driver) - - -# Test. -# -$(test): $(driver) - $(call message,test $<,$<) - - -# Clean. -# -$(clean): \ - $(driver).o.clean \ - $(addsuffix .cxx.clean,$(cxx_obj)) \ - $(addsuffix .cxx.clean,$(cxx_od)) - - -# Generated .gitignore. -# -ifeq ($(out_base),$(src_base)) -$(driver): | $(out_base)/.gitignore - -$(out_base)/.gitignore: files := driver -$(clean): $(out_base)/.gitignore.clean - -$(call include,$(bld_root)/git/gitignore.make) -endif - - -# How to. -# -$(call include,$(bld_root)/cxx/o-e.make) -$(call include,$(bld_root)/cxx/cxx-o.make) -$(call include,$(bld_root)/cxx/cxx-d.make) - -# Dependencies. -# -$(call import,$(src_root)/cutl/makefile) |