diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 19:26:09 +0200 |
| commit | ee3b7be185f7d887a33b9c242a7ccd08a09d2614 (patch) | |
| tree | 1974211a0cbd5e3df95b6deed0b2b42f7854aca9 /cpp/test | |
| parent | Rename files for consistency (diff) | |
| download | ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.bz2 ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.tar.xz ice-ee3b7be185f7d887a33b9c242a7ccd08a09d2614.zip | |
Re-factored gmake build system
Diffstat (limited to 'cpp/test')
255 files changed, 886 insertions, 5300 deletions
diff --git a/cpp/test/Common/.gitignore b/cpp/test/Common/.gitignore deleted file mode 100644 index 3ff6195f620..00000000000 --- a/cpp/test/Common/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Controller.cpp -Controller.h diff --git a/cpp/test/Common/Makefile b/cpp/test/Common/Makefile deleted file mode 100644 index 362a7dd0bff..00000000000 --- a/cpp/test/Common/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -testincdir = ../include - -LIBFILENAME = $(call mklibfilename,TestCommon,$(VERSION)) -SONAME = $(call mksoname,TestCommon,$(SOVERSION)) -LIBNAME = $(call mklibname,TestCommon) -TARGETS = $(call mklibtargets,$(libdir)/$(LIBFILENAME),$(libdir)/$(SONAME),$(libdir)$(cpp11libdirsuffix)/$(LIBNAME)) - -SLICE_OBJS = Controller.o - -OBJS = TestCommon.o \ - $(SLICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I$(testincdir) $(CPPFLAGS) -DTEST_API_EXPORTS -SLICE2CPPFLAGS := --dll-export TEST_API $(SLICE2CPPFLAGS) - -ifeq ($(STATICLIBS),yes) -$(libdir)/$(LIBNAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mklib,$@,$(OBJS)) -else -$(libdir)/$(LIBFILENAME): $(OBJS) - @mkdir -p $(dir $@) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(OBJS),$(LIBS)) - -$(libdir)/$(SONAME): $(libdir)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(libdir)$(cpp11libdirsuffix)/$(LIBNAME): $(libdir)/$(SONAME) - @mkdir -p $(libdir)$(cpp11libdirsuffix) - rm -f $@ - ln -s $(cpp11sonamedir)$(SONAME) $@ -endif diff --git a/cpp/test/Common/Makefile.mk b/cpp/test/Common/Makefile.mk new file mode 100644 index 00000000000..7e470870aa1 --- /dev/null +++ b/cpp/test/Common/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(project)_libraries = TestCommon +$(project)_noinstall := 1 + +TestCommon_targetdir := lib +TestCommon_dependencies := Ice IceUtil +TestCommon_sliceflags := --dll-export TEST_API +TestCommon_cppflags := -I$(includedir) -I$(project) -Itest/include -DTEST_API_EXPORTS + +projects += $(project) diff --git a/cpp/test/Glacier2/Makefile b/cpp/test/Glacier2/Makefile deleted file mode 100644 index d7f5bf64db7..00000000000 --- a/cpp/test/Glacier2/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = router \ - attack \ - override \ - staticFiltering \ - dynamicFiltering \ - sessionControl \ - sessionHelper \ - ssl - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Glacier2/attack/.gitignore b/cpp/test/Glacier2/attack/.gitignore deleted file mode 100644 index a0c8f4f0ab1..00000000000 --- a/cpp/test/Glacier2/attack/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Backend.cpp -Backend.h diff --git a/cpp/test/Glacier2/attack/Makefile b/cpp/test/Glacier2/attack/Makefile deleted file mode 100644 index 442a3a4e99c..00000000000 --- a/cpp/test/Glacier2/attack/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Backend.o - -COBJS = $(SLICE_OBJS) \ - BackendI.o \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - BackendI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/attack/Makefile.mk b/cpp/test/Glacier2/attack/Makefile.mk new file mode 100644 index 00000000000..01308c58317 --- /dev/null +++ b/cpp/test/Glacier2/attack/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice +$(test)_client_dependencies = Glacier2 + +$(test)_server_sources = Server.cpp BackendI.cpp Backend.ice + +tests += $(test) diff --git a/cpp/test/Glacier2/dynamicFiltering/.gitignore b/cpp/test/Glacier2/dynamicFiltering/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Glacier2/dynamicFiltering/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile b/cpp/test/Glacier2/dynamicFiltering/Makefile deleted file mode 100644 index 2c47cc040bf..00000000000 --- a/cpp/test/Glacier2/dynamicFiltering/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - Server.o \ - SessionI.o \ - BackendI.o \ - TestControllerI.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) diff --git a/cpp/test/Glacier2/dynamicFiltering/Makefile.mk b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk new file mode 100644 index 00000000000..5545484237e --- /dev/null +++ b/cpp/test/Glacier2/dynamicFiltering/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = Glacier2 Ice IceUtil TestCommon + +$(test)_client_sources = Client.cpp Test.ice + +$(test)_server_sources = Server.cpp TestControllerI.cpp BackendI.cpp SessionI.cpp Test.ice + +tests += $(test) diff --git a/cpp/test/Glacier2/override/.gitignore b/cpp/test/Glacier2/override/.gitignore deleted file mode 100644 index 64d5c068c33..00000000000 --- a/cpp/test/Glacier2/override/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -.depend -Callback.cpp -Callback.h diff --git a/cpp/test/Glacier2/override/Makefile b/cpp/test/Glacier2/override/Makefile deleted file mode 100644 index b026ce533e7..00000000000 --- a/cpp/test/Glacier2/override/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Callback.o - -COBJS = $(SLICE_OBJS) \ - CallbackI.o \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - CallbackI.o \ - Server.o - -SRCS = $(OBJS:.o=.cpp) \ - $(COBJS:.o=.cpp) \ - $(SOBJS:.o=.cpp) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/override/Makefile.mk b/cpp/test/Glacier2/override/Makefile.mk new file mode 100644 index 00000000000..ecafb149f1d --- /dev/null +++ b/cpp/test/Glacier2/override/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice +$(test)_client_dependencies = Glacier2 + +$(test)_server_sources = Server.cpp CallbackI.cpp Callback.ice + +tests += $(test) diff --git a/cpp/test/Glacier2/router/.gitignore b/cpp/test/Glacier2/router/.gitignore deleted file mode 100644 index 8671f03d5a1..00000000000 --- a/cpp/test/Glacier2/router/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Callback.cpp -Callback.h diff --git a/cpp/test/Glacier2/router/Makefile b/cpp/test/Glacier2/router/Makefile deleted file mode 100644 index 7b1981e66d3..00000000000 --- a/cpp/test/Glacier2/router/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Callback.o - -COBJS = $(SLICE_OBJS) \ - CallbackI.o \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - CallbackI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/router/Makefile.mk b/cpp/test/Glacier2/router/Makefile.mk new file mode 100644 index 00000000000..ecafb149f1d --- /dev/null +++ b/cpp/test/Glacier2/router/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp CallbackI.cpp Callback.ice +$(test)_client_dependencies = Glacier2 + +$(test)_server_sources = Server.cpp CallbackI.cpp Callback.ice + +tests += $(test) diff --git a/cpp/test/Glacier2/sessionControl/.gitignore b/cpp/test/Glacier2/sessionControl/.gitignore deleted file mode 100644 index 88130e8077a..00000000000 --- a/cpp/test/Glacier2/sessionControl/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Session.cpp -Session.h diff --git a/cpp/test/Glacier2/sessionControl/Makefile b/cpp/test/Glacier2/sessionControl/Makefile deleted file mode 100644 index 8e0a52910ea..00000000000 --- a/cpp/test/Glacier2/sessionControl/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Session.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - Server.o \ - SessionI.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(LIBS) diff --git a/cpp/test/Slice/utf8BOM/Makefile b/cpp/test/Glacier2/sessionControl/Makefile.mk index 81e40e9a6c8..39e93bceac6 100644 --- a/cpp/test/Slice/utf8BOM/Makefile +++ b/cpp/test/Glacier2/sessionControl/Makefile.mk @@ -1,21 +1,16 @@ # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** -top_srcdir = ../../.. +$(test)_dependencies = Glacier2 Ice IceUtil TestCommon -TARGETS = $(OBJS) +$(test)_client_sources = Client.cpp Session.ice -SLICE_OBJS = Test.o +$(test)_server_sources = Server.cpp SessionI.cpp Session.ice -OBJS = $(SLICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) -CPPFLAGS := -I. $(CPPFLAGS) +tests += $(test) diff --git a/cpp/test/Glacier2/sessionHelper/.gitignore b/cpp/test/Glacier2/sessionHelper/.gitignore deleted file mode 100644 index 8671f03d5a1..00000000000 --- a/cpp/test/Glacier2/sessionHelper/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Callback.cpp -Callback.h diff --git a/cpp/test/Glacier2/sessionHelper/Makefile b/cpp/test/Glacier2/sessionHelper/Makefile deleted file mode 100644 index 711c25eaa60..00000000000 --- a/cpp/test/Glacier2/sessionHelper/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Callback.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) diff --git a/cpp/test/Glacier2/sessionHelper/Makefile.mk b/cpp/test/Glacier2/sessionHelper/Makefile.mk new file mode 100644 index 00000000000..ba1f9f16732 --- /dev/null +++ b/cpp/test/Glacier2/sessionHelper/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp Callback.ice +$(test)_client_dependencies = Glacier2 + +$(test)_server_sources = Server.cpp Callback.ice + +tests += $(test) diff --git a/cpp/test/Glacier2/ssl/.gitignore b/cpp/test/Glacier2/ssl/.gitignore deleted file mode 100644 index bc1dd55fba1..00000000000 --- a/cpp/test/Glacier2/ssl/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend diff --git a/cpp/test/Glacier2/ssl/Makefile b/cpp/test/Glacier2/ssl/Makefile deleted file mode 100644 index f09c5d0e11b..00000000000 --- a/cpp/test/Glacier2/ssl/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -COBJS = Client.o - -SOBJS = Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(OBJS) $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS) diff --git a/cpp/test/Glacier2/ssl/Makefile.mk b/cpp/test/Glacier2/ssl/Makefile.mk new file mode 100644 index 00000000000..2fbb2c4fa7a --- /dev/null +++ b/cpp/test/Glacier2/ssl/Makefile.mk @@ -0,0 +1,13 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_dependencies = Glacier2 +$(test)_server_dependencies = Glacier2 IceSSL + +tests += $(test) diff --git a/cpp/test/Glacier2/staticFiltering/.gitignore b/cpp/test/Glacier2/staticFiltering/.gitignore deleted file mode 100644 index 6257255fb0a..00000000000 --- a/cpp/test/Glacier2/staticFiltering/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Backend.cpp -Backend.h -attack.cfg -router.cfg -server.cfg diff --git a/cpp/test/Glacier2/staticFiltering/Makefile b/cpp/test/Glacier2/staticFiltering/Makefile deleted file mode 100644 index 7463f56a978..00000000000 --- a/cpp/test/Glacier2/staticFiltering/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Backend.o - -COBJS = $(SLICE_OBJS) \ - BackendI.o \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - BackendI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f attack.cfg router.cfg server.cfg diff --git a/cpp/test/Glacier2/staticFiltering/Makefile.mk b/cpp/test/Glacier2/staticFiltering/Makefile.mk new file mode 100644 index 00000000000..01308c58317 --- /dev/null +++ b/cpp/test/Glacier2/staticFiltering/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp BackendI.cpp Backend.ice +$(test)_client_dependencies = Glacier2 + +$(test)_server_sources = Server.cpp BackendI.cpp Backend.ice + +tests += $(test) diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile deleted file mode 100644 index f0e469f2c08..00000000000 --- a/cpp/test/Ice/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = proxy \ - operations \ - exceptions \ - ami \ - info \ - inheritance \ - facets \ - objects \ - faultTolerance \ - location \ - adapterDeactivation \ - slicing \ - hash \ - checksum \ - dispatcher \ - hold \ - binding \ - retry \ - timeout \ - acm \ - servantLocator \ - interceptor \ - stringConverter \ - background \ - udp \ - defaultServant \ - defaultValue \ - threadPoolPriority \ - invoke \ - properties \ - plugin \ - admin \ - metrics \ - enums \ - logger \ - networkProxy \ - impl \ - stream - -ifneq ($(CPP11_MAPPING),yes) -SUBDIRS := $(SUBDIRS) \ - optional \ - gc \ - custom \ - echo -endif - -ifeq ($(findstring MINGW,$(UNAME)),) -SUBDIRS := $(SUBDIRS) services -endif - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Ice/acm/.gitignore b/cpp/test/Ice/acm/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/acm/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/acm/Makefile b/cpp/test/Ice/acm/Makefile deleted file mode 100644 index 03f6da96337..00000000000 --- a/cpp/test/Ice/acm/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/adapterDeactivation/.gitignore b/cpp/test/Ice/adapterDeactivation/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/adapterDeactivation/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/adapterDeactivation/Makefile b/cpp/test/Ice/adapterDeactivation/Makefile deleted file mode 100644 index 945162ab957..00000000000 --- a/cpp/test/Ice/adapterDeactivation/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - ServantLocatorI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - ServantLocatorI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/adapterDeactivation/Makefile.mk b/cpp/test/Ice/adapterDeactivation/Makefile.mk new file mode 100644 index 00000000000..2f49768a5cf --- /dev/null +++ b/cpp/test/Ice/adapterDeactivation/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_server_sources = Server.cpp TestI.cpp Test.ice ServantLocatorI.cpp + +tests += $(test) diff --git a/cpp/test/Ice/admin/.gitignore b/cpp/test/Ice/admin/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/admin/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/admin/Makefile b/cpp/test/Ice/admin/Makefile deleted file mode 100644 index a0b17c9379a..00000000000 --- a/cpp/test/Ice/admin/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/ami/.gitignore b/cpp/test/Ice/ami/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/ami/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/ami/Makefile b/cpp/test/Ice/ami/Makefile deleted file mode 100644 index 3971a251843..00000000000 --- a/cpp/test/Ice/ami/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - Collocated.o \ - AllTests.o \ - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/background/.gitignore b/cpp/test/Ice/background/.gitignore deleted file mode 100644 index 2c327f510eb..00000000000 --- a/cpp/test/Ice/background/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -libTestTransport.* -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/background/Makefile b/cpp/test/Ice/background/Makefile deleted file mode 100644 index 37ccb68fdc5..00000000000 --- a/cpp/test/Ice/background/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TSPFILENAME = $(call mklibfilename,TestTransport,$(VERSION)) -TSPSONAME = $(call mksoname,TestTransport,$(SOVERSION)) -TSPLIBNAME = $(call mklibname,TestTransport) - -TARGETS = $(CLIENT) $(SERVER) $(call mklibtargets,$(TSPFILENAME),$(TSPSONAME),$(TSPLIBNAME)) - -SLICE_OBJS = Test.o - -COBJS = Configuration.o \ - Test.o \ - Client.o \ - AllTests.o - -SOBJS = Configuration.o \ - Test.o \ - TestI.o \ - Server.o - -TRANSPORT_OBJS = Test.o \ - Configuration.o \ - Connector.o \ - Acceptor.o \ - EndpointI.o \ - Transceiver.o \ - EndpointFactory.o \ - PluginI.o - -OBJS = $(TRANSPORT_OBJS) \ - $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include -I../../../src $(CPPFLAGS) $(NO_DEPRECATED_FLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(TSPFILENAME): $(TRANSPORT_OBJS) - rm -f $@ - $(call mkshlib,$@,$(TSPSONAME),$(TRANSPORT_OBJS),$(TEST_LIBS)) - -$(TSPSONAME): $(TSPFILENAME) - rm -f $@ - ln -s $(TSPFILENAME) $@ - -$(TSPLIBNAME): $(TSPSONAME) - rm -f $@ - ln -s $(TSPSONAME) $@ diff --git a/cpp/test/Ice/background/Makefile.mk b/cpp/test/Ice/background/Makefile.mk new file mode 100644 index 00000000000..d202a9ce917 --- /dev/null +++ b/cpp/test/Ice/background/Makefile.mk @@ -0,0 +1,25 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestTransport +$(test)_cppflags := -I$(srcdir) + +$(test)_client_sources = $(test-client-sources) Configuration.cpp +$(test)_server_sources = $(test-server-sources) Configuration.cpp + +$(test)_TestTransport_sources = Test.ice \ + Configuration.cpp \ + Connector.cpp \ + Acceptor.cpp \ + EndpointI.cpp \ + Transceiver.cpp \ + EndpointFactory.cpp \ + PluginI.cpp + +tests += $(test) diff --git a/cpp/test/Ice/binding/.gitignore b/cpp/test/Ice/binding/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/binding/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/binding/Makefile b/cpp/test/Ice/binding/Makefile deleted file mode 100644 index a0b17c9379a..00000000000 --- a/cpp/test/Ice/binding/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/checksum/.gitignore b/cpp/test/Ice/checksum/.gitignore deleted file mode 100644 index 4e9331c8cda..00000000000 --- a/cpp/test/Ice/checksum/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -ClientTypes.cpp -ClientTypes.h -server -ServerTypes.cpp -ServerTypes.h -Test.cpp -Types.cpp -Test.h -Types.h diff --git a/cpp/test/Ice/checksum/Makefile b/cpp/test/Ice/checksum/Makefile deleted file mode 100644 index f62a2c56b09..00000000000 --- a/cpp/test/Ice/checksum/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - - -SLICE_OBJS = Test.o ServerTypes.o ClientTypes.o - -COBJS = Test.o \ - ClientTypes.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - ServerTypes.o \ - Server.o \ - TestI.o - -OBJS = $(COBJS) $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -SLICE2CPPFLAGS := --checksum $(SLICE2CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/checksum/Makefile.mk b/cpp/test/Ice/checksum/Makefile.mk new file mode 100644 index 00000000000..9a4ed6eb94e --- /dev/null +++ b/cpp/test/Ice/checksum/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_sliceflags = --checksum +$(test)_client_sources = $(test-client-sources) ClientTypes.ice +$(test)_server_sources = $(test-server-sources) ServerTypes.ice + +tests += $(test) diff --git a/cpp/test/Ice/custom/.gitignore b/cpp/test/Ice/custom/.gitignore deleted file mode 100644 index 554110014d7..00000000000 --- a/cpp/test/Ice/custom/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Wstring.cpp -WstringAMD.cpp -Test.h -TestAMD.h -Wstring.h -WstringAMD.h diff --git a/cpp/test/Ice/custom/Makefile b/cpp/test/Ice/custom/Makefile deleted file mode 100644 index 0732fda1b3e..00000000000 --- a/cpp/test/Ice/custom/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - TestAMD.o \ - Wstring.o \ - WstringAMD.o - -COBJS = Test.o \ - Wstring.o \ - Client.o \ - AllTests.o \ - MyByteSeq.o \ - StringConverterI.o - -SOBJS = Test.o \ - Wstring.o \ - TestI.o \ - WstringI.o \ - Server.o \ - MyByteSeq.o \ - StringConverterI.o - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - WstringAMD.o \ - WstringAMDI.o \ - ServerAMD.o \ - MyByteSeq.o \ - StringConverterI.o - -COLOBJS = Test.o \ - Wstring.o \ - TestI.o \ - WstringI.o \ - Collocated.o \ - AllTests.o \ - MyByteSeq.o \ - StringConverterI.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -DSTRING_VIEW_IGNORE_STRING_CONVERTER - - -# -# Disables optimization when building with Solaris CC: -# AllTests.cpp takes a very very long time to compile with -O -# -ifeq ($(UNAME),SunOS) -ifeq ($(CXX),CC) -ifeq ($(OPTIMIZE),yes) - -AllTests.o: AllTests.cpp - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -xO0 $< -endif -endif -endif - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/custom/Makefile.mk b/cpp/test/Ice/custom/Makefile.mk new file mode 100644 index 00000000000..3a40e81bdfc --- /dev/null +++ b/cpp/test/Ice/custom/Makefile.mk @@ -0,0 +1,35 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_cppflags = -DSTRING_VIEW_IGNORE_STRING_CONVERTER + +$(test)_client_sources = Client.cpp \ + AllTests.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp + +$(test)_server_sources = Server.cpp \ + TestI.cpp \ + WstringI.cpp \ + Test.ice \ + Wstring.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp + +$(test)_serveramd_sources = ServerAMD.cpp \ + TestAMDI.cpp \ + WstringAMDI.cpp \ + TestAMD.ice \ + WstringAMD.ice \ + MyByteSeq.cpp \ + StringConverterI.cpp + +tests += $(test) diff --git a/cpp/test/Ice/defaultServant/.gitignore b/cpp/test/Ice/defaultServant/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/defaultServant/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/defaultServant/Makefile b/cpp/test/Ice/defaultServant/Makefile deleted file mode 100644 index dce22591624..00000000000 --- a/cpp/test/Ice/defaultServant/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - TestI.o \ - Client.o \ - AllTests.o - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) diff --git a/cpp/test/Ice/defaultServant/Makefile.mk b/cpp/test/Ice/defaultServant/Makefile.mk new file mode 100644 index 00000000000..57aad5bd691 --- /dev/null +++ b/cpp/test/Ice/defaultServant/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp AllTests.cpp Test.ice TestI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/defaultValue/.gitignore b/cpp/test/Ice/defaultValue/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/defaultValue/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/defaultValue/Makefile b/cpp/test/Ice/defaultValue/Makefile deleted file mode 100644 index f39e0d6f806..00000000000 --- a/cpp/test/Ice/defaultValue/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) diff --git a/cpp/test/Ice/dispatcher/.gitignore b/cpp/test/Ice/dispatcher/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/dispatcher/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/dispatcher/Makefile b/cpp/test/Ice/dispatcher/Makefile deleted file mode 100644 index bf914706aa2..00000000000 --- a/cpp/test/Ice/dispatcher/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Dispatcher.o \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - Dispatcher.o \ - TestI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - Dispatcher.o \ - TestI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/dispatcher/Makefile.mk b/cpp/test/Ice/dispatcher/Makefile.mk new file mode 100644 index 00000000000..4949323e198 --- /dev/null +++ b/cpp/test/Ice/dispatcher/Makefile.mk @@ -0,0 +1,13 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = $(test-client-sources) Dispatcher.cpp +$(test)_server_sources = $(test-server-sources) Dispatcher.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/echo/.gitignore b/cpp/test/Ice/echo/.gitignore deleted file mode 100644 index 571c54bbb1f..00000000000 --- a/cpp/test/Ice/echo/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/echo/Makefile b/cpp/test/Ice/echo/Makefile deleted file mode 100644 index 55016f7004d..00000000000 --- a/cpp/test/Ice/echo/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -SERVER = $(call mktestname,server) - -TARGETS = $(SERVER) - -SLICE_OBJS = Test.o - -OBJS = $(SLICE_OBJS) \ - BlobjectI.o \ - Server.o - -SRCS = $(SOBJS:.o=.cpp) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(SERVER): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/echo/Makefile.mk b/cpp/test/Ice/echo/Makefile.mk new file mode 100644 index 00000000000..0ec7edf5455 --- /dev/null +++ b/cpp/test/Ice/echo/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_server_sources = Test.ice BlobjectI.cpp Server.cpp + +tests += $(test) diff --git a/cpp/test/Ice/enums/.gitignore b/cpp/test/Ice/enums/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/enums/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/enums/Makefile b/cpp/test/Ice/enums/Makefile deleted file mode 100644 index ab6c5939e07..00000000000 --- a/cpp/test/Ice/enums/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPFLAGS := $(SLICE2CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/exceptions/.gitignore b/cpp/test/Ice/exceptions/.gitignore deleted file mode 100644 index 725fdbfe47e..00000000000 --- a/cpp/test/Ice/exceptions/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/exceptions/Makefile b/cpp/test/Ice/exceptions/Makefile deleted file mode 100644 index 5ed083b73a4..00000000000 --- a/cpp/test/Ice/exceptions/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o TestAMD.o - -COMMON_OBJS = ExceptionsI.o - -COBJS = $(COMMON_OBJS) \ - Test.o \ - Client.o \ - AllTests.o - -SOBJS = $(COMMON_OBJS) \ - Test.o \ - TestI.o \ - Server.o - -SAMDOBJS = $(COMMON_OBJS) \ - TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -COLOBJS = $(COMMON_OBJS) \ - Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/exceptions/Makefile.mk b/cpp/test/Ice/exceptions/Makefile.mk new file mode 100644 index 00000000000..d63a17b5e4a --- /dev/null +++ b/cpp/test/Ice/exceptions/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = $(test-client-sources) ExceptionsI.cpp +$(test)_server_sources = $(test-server-sources) ExceptionsI.cpp +$(test)_serveramd_sources = $(test-serveramd-sources) ExceptionsI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/facets/.gitignore b/cpp/test/Ice/facets/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/facets/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/facets/Makefile b/cpp/test/Ice/facets/Makefile deleted file mode 100644 index f8944cda802..00000000000 --- a/cpp/test/Ice/facets/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/faultTolerance/.gitignore b/cpp/test/Ice/faultTolerance/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/faultTolerance/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/faultTolerance/Makefile b/cpp/test/Ice/faultTolerance/Makefile deleted file mode 100644 index 4237ba851ef..00000000000 --- a/cpp/test/Ice/faultTolerance/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(LIBS)) diff --git a/cpp/test/Ice/gc/.gitignore b/cpp/test/Ice/gc/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/gc/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/gc/Makefile b/cpp/test/Ice/gc/Makefile deleted file mode 100644 index 7838d08559c..00000000000 --- a/cpp/test/Ice/gc/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -OBJS = $(SLICE_OBJS) \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS) $(LIBS)) diff --git a/cpp/test/Ice/hash/.gitignore b/cpp/test/Ice/hash/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/hash/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/hash/Makefile b/cpp/test/Ice/hash/Makefile deleted file mode 100644 index 6e9ee476fb5..00000000000 --- a/cpp/test/Ice/hash/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(NO_DEPRECATED_FLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS) $(LIBS)) diff --git a/cpp/test/Ice/hold/.gitignore b/cpp/test/Ice/hold/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/hold/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/hold/Makefile b/cpp/test/Ice/hold/Makefile deleted file mode 100644 index 8fd575dac1a..00000000000 --- a/cpp/test/Ice/hold/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/impl/.gitignore b/cpp/test/Ice/impl/.gitignore deleted file mode 100644 index b2ac5097002..00000000000 --- a/cpp/test/Ice/impl/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -server -serveramd -Test.cpp -TestI.cpp -TestAMD.cpp -TestAMDI.cpp -Test.h -TestI.h -TestAMD.h -TestAMDI.h diff --git a/cpp/test/Ice/impl/Makefile b/cpp/test/Ice/impl/Makefile deleted file mode 100644 index d2e3f7fc62c..00000000000 --- a/cpp/test/Ice/impl/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) - -TARGETS = $(SERVER) $(SERVERAMD) - -SLICE_OBJS = Test.o TestAMD.o - -SOBJS = Test.o \ - TestI.o \ - Server.o \ - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -OBJS = $(SOBJS) \ - $(SAMDOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -ifeq ($(CPP11_MAPPING),yes) -SLICE2CPPFLAGS := --impl-c++11 $(SLICE2CPPFLAGS) -else -SLICE2CPPFLAGS := --impl-c++98 $(SLICE2CPPFLAGS) -endif - -Test.cpp: Test.ice $(SLICE2CPP) - rm -f $(*F).h $(*F).cpp $(*F)I.h $(*F)I.cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice - @touch $(*F).cpp - -Test.h TestI.cpp TestI.h: Test.cpp - - -TestAMD.cpp: TestAMD.ice $(SLICE2CPP) - rm -f $(*F).h $(*F).cpp $(*F)I.h $(*F)I.cpp - $(SLICE2CPP) $(SLICE2CPPFLAGS) $(*F).ice - @touch $(*F).cpp - -TestAMD.h TestAMDI.cpp TestAMDI.h: TestAMD.cpp - - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -clean:: - rm -f TestI.cpp TestI.h - rm -f TestAMDI.cpp TestAMDI.h diff --git a/cpp/test/Ice/info/.gitignore b/cpp/test/Ice/info/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/info/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/info/Makefile b/cpp/test/Ice/info/Makefile deleted file mode 100644 index 2d633d2f039..00000000000 --- a/cpp/test/Ice/info/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - TestI.o \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(ICESSL_LIBS) $(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(LIBS)) diff --git a/cpp/test/Ice/info/Makefile.mk b/cpp/test/Ice/info/Makefile.mk new file mode 100644 index 00000000000..434ad5349fa --- /dev/null +++ b/cpp/test/Ice/info/Makefile.mk @@ -0,0 +1,13 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Test.ice TestI.cpp Client.cpp AllTests.cpp +$(test)_dependencies = IceSSL Ice IceUtil TestCommon + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/inheritance/.gitignore b/cpp/test/Ice/inheritance/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/inheritance/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/inheritance/Makefile b/cpp/test/Ice/inheritance/Makefile deleted file mode 100644 index f8944cda802..00000000000 --- a/cpp/test/Ice/inheritance/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/interceptor/.gitignore b/cpp/test/Ice/interceptor/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/interceptor/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/interceptor/Makefile b/cpp/test/Ice/interceptor/Makefile deleted file mode 100644 index 9ef00f49b67..00000000000 --- a/cpp/test/Ice/interceptor/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - TestI.o \ - Client.o \ - InterceptorI.o \ - AMDInterceptorI.o \ - MyObjectI.o - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) diff --git a/cpp/test/Ice/interceptor/Makefile.mk b/cpp/test/Ice/interceptor/Makefile.mk new file mode 100644 index 00000000000..28fb6056f2e --- /dev/null +++ b/cpp/test/Ice/interceptor/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp Test.ice TestI.cpp MyObjectI.cpp InterceptorI.cpp AMDInterceptorI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/invoke/.gitignore b/cpp/test/Ice/invoke/.gitignore deleted file mode 100644 index 2ec67c2a17c..00000000000 --- a/cpp/test/Ice/invoke/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/invoke/Makefile b/cpp/test/Ice/invoke/Makefile deleted file mode 100644 index ea018bc404d..00000000000 --- a/cpp/test/Ice/invoke/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - BlobjectI.o \ - Server.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/invoke/Makefile.mk b/cpp/test/Ice/invoke/Makefile.mk new file mode 100644 index 00000000000..2c55495f909 --- /dev/null +++ b/cpp/test/Ice/invoke/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_server_sources = Server.cpp Test.ice BlobjectI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/location/.gitignore b/cpp/test/Ice/location/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/location/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/location/Makefile b/cpp/test/Ice/location/Makefile deleted file mode 100644 index bc4e304fe96..00000000000 --- a/cpp/test/Ice/location/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - ServerLocator.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/location/Makefile.mk b/cpp/test/Ice/location/Makefile.mk new file mode 100644 index 00000000000..4796192ccc7 --- /dev/null +++ b/cpp/test/Ice/location/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_server_sources = $(test-server-sources) ServerLocator.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/logger/.gitignore b/cpp/test/Ice/logger/.gitignore deleted file mode 100644 index b92e9bec8ae..00000000000 --- a/cpp/test/Ice/logger/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client1 -client2 -client3 -client4 -client5 -.depend diff --git a/cpp/test/Ice/logger/Makefile b/cpp/test/Ice/logger/Makefile deleted file mode 100644 index 48c270503ad..00000000000 --- a/cpp/test/Ice/logger/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT1 = $(call mktestname,client1) -CLIENT2 = $(call mktestname,client2) -CLIENT3 = $(call mktestname,client3) -CLIENT4 = $(call mktestname,client4) -CLIENT5 = $(call mktestname,client5) - -TARGETS = $(CLIENT1) $(CLIENT2) $(CLIENT3) $(CLIENT4) $(CLIENT5) - -C1OBJS = Client1.o -C2OBJS = Client2.o -C3OBJS = Client3.o -C4OBJS = Client4.o -C5OBJS = Client5.o - -OBJS = $(C1OBJS) \ - $(C2OBJS) \ - $(C3OBJS) \ - $(C4OBJS) \ - $(C5OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -LINKWITH := $(LIBS) $(ICONV_LIBS) - -$(CLIENT1): $(C1OBJS) - rm -f $@ - $(call mktest,$@,$(C1OBJS),$(LINKWITH)) - -$(CLIENT2): $(C2OBJS) - rm -f $@ - $(call mktest,$@,$(C2OBJS),$(LINKWITH)) - -$(CLIENT3): $(C3OBJS) - rm -f $@ - $(call mktest,$@,$(C3OBJS),$(LINKWITH)) - -$(CLIENT4): $(C4OBJS) - rm -f $@ - $(call mktest,$@,$(C4OBJS),$(LINKWITH)) - -$(CLIENT5): $(C5OBJS) - rm -f $@ - $(call mktest,$@,$(C5OBJS),$(LINKWITH)) diff --git a/cpp/test/Ice/logger/Makefile.mk b/cpp/test/Ice/logger/Makefile.mk new file mode 100644 index 00000000000..4dc1fb7870d --- /dev/null +++ b/cpp/test/Ice/logger/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = client1 client2 client3 client4 client5 +$(test)_libs = iconv + +$(test)_client1_sources = Client1.cpp +$(test)_client2_sources = Client2.cpp +$(test)_client3_sources = Client3.cpp +$(test)_client4_sources = Client4.cpp +$(test)_client5_sources = Client5.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/metrics/.gitignore b/cpp/test/Ice/metrics/.gitignore deleted file mode 100644 index 725fdbfe47e..00000000000 --- a/cpp/test/Ice/metrics/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/metrics/Makefile b/cpp/test/Ice/metrics/Makefile deleted file mode 100644 index 55d7c31cd14..00000000000 --- a/cpp/test/Ice/metrics/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o TestAMD.o - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -COLOBJS = Test.o \ - Collocated.o \ - AllTests.o \ - TestI.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(LIBS)) diff --git a/cpp/test/Ice/networkProxy/.gitignore b/cpp/test/Ice/networkProxy/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/networkProxy/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/networkProxy/Makefile b/cpp/test/Ice/networkProxy/Makefile deleted file mode 100644 index ce980d52561..00000000000 --- a/cpp/test/Ice/networkProxy/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(LIBS)) diff --git a/cpp/test/Ice/objects/.gitignore b/cpp/test/Ice/objects/.gitignore deleted file mode 100644 index 786b3556d1c..00000000000 --- a/cpp/test/Ice/objects/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Derived.cpp -DerivedEx.cpp -Test.h -Derived.cpp -Derived.h -DerivedEx.cpp -DerivedEx.h diff --git a/cpp/test/Ice/objects/Makefile b/cpp/test/Ice/objects/Makefile deleted file mode 100644 index 57858203006..00000000000 --- a/cpp/test/Ice/objects/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) -TESTLIBNAME = libTestDerived.a - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - Derived.o \ - DerivedEx.o - -COBJS = TestI.o \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - TestIntfI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - TestIntfI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LDFLAGS := -L. $(LDFLAGS) - -$(TESTLIBNAME): $(SLICE_OBJS) - rm -f $@ - $(call mklib,$@,$(SLICE_OBJS)) - -$(CLIENT): $(COBJS) $(TESTLIBNAME) - rm -f $@ - $(call mktest,$@,$(COBJS),-lTestDerived $(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/objects/Makefile.mk b/cpp/test/Ice/objects/Makefile.mk new file mode 100644 index 00000000000..f7429b01e98 --- /dev/null +++ b/cpp/test/Ice/objects/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_sliceflags := -I$(test) +$(test)_client_sources = Client.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp AllTests.cpp +$(test)_server_sources = Server.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp +$(test)_collocated_sources = Collocated.cpp Test.ice Derived.ice DerivedEx.ice TestI.cpp TestIntfI.cpp AllTests.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/operations/.gitignore b/cpp/test/Ice/operations/.gitignore deleted file mode 100644 index 725fdbfe47e..00000000000 --- a/cpp/test/Ice/operations/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/operations/Makefile b/cpp/test/Ice/operations/Makefile deleted file mode 100644 index 53c9e4323e1..00000000000 --- a/cpp/test/Ice/operations/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o TestAMD.o - -COBJS = Test.o \ - Client.o \ - AllTests.o \ - Twoways.o \ - Oneways.o \ - TwowaysAMI.o \ - OnewaysAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o - -SOBJS = Test.o \ - TestI.o \ - Server.o \ - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -COLOBJS = Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o \ - Twoways.o \ - Oneways.o \ - TwowaysAMI.o \ - OnewaysAMI.o \ - BatchOneways.o \ - BatchOnewaysAMI.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/operations/Makefile.mk b/cpp/test/Ice/operations/Makefile.mk new file mode 100644 index 00000000000..e55108a0768 --- /dev/null +++ b/cpp/test/Ice/operations/Makefile.mk @@ -0,0 +1,20 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Test.ice \ + Client.cpp \ + AllTests.cpp \ + Twoways.cpp \ + Oneways.cpp \ + TwowaysAMI.cpp \ + OnewaysAMI.cpp \ + BatchOneways.cpp \ + BatchOnewaysAMI.cpp + +tests += $(test) diff --git a/cpp/test/Ice/optional/.gitignore b/cpp/test/Ice/optional/.gitignore deleted file mode 100644 index f1f62485ccb..00000000000 --- a/cpp/test/Ice/optional/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/optional/Makefile b/cpp/test/Ice/optional/Makefile deleted file mode 100644 index be733d9c9d6..00000000000 --- a/cpp/test/Ice/optional/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) - -SLICE_OBJS = Test.o \ - TestAMD.o - -COBJS = Test.o \ - TestI.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/plugin/.gitignore b/cpp/test/Ice/plugin/.gitignore deleted file mode 100644 index acda1ecf37a..00000000000 --- a/cpp/test/Ice/plugin/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -plugins/libTestPlugin.* -.depend diff --git a/cpp/test/Ice/plugin/Client.cpp b/cpp/test/Ice/plugin/Client.cpp index 49855b888ee..12305af063b 100644 --- a/cpp/test/Ice/plugin/Client.cpp +++ b/cpp/test/Ice/plugin/Client.cpp @@ -84,6 +84,21 @@ main(int argc, char* argv[]) int status = EXIT_SUCCESS; Ice::CommunicatorPtr communicator; + if(argc < 2) + { + cerr << "usage: " << argv[0] << " <plugindir>"; + } + + // + // Plugin directory is provided as the last argument + // +#if defined(ICE_OS_WINRT) + string pluginDir = "plugins/winrt/"; +#else + string pluginDir = argv[argc - 1]; + pluginDir += "/"; +#endif + Ice::registerPluginFactory("Static1", createMyPlugin, true); // true = Load on communicator initialization Ice::registerPluginFactory("Static2", createMyPlugin, false); @@ -126,29 +141,6 @@ main(int argc, char* argv[]) } cout << "ok" << endl; -#if !defined(_WIN32) - string pluginDir = "plugins/"; -#elif defined(ICE_OS_WINRT) - string pluginDir = "plugins/winrt/"; -#else - string pluginDir = "msbuild/testplugin/"; -# if defined(_M_X64) - pluginDir += "x64/"; -# else - pluginDir += "Win32/"; -# endif - -# if defined(ICE_CPP11_MAPPING) - pluginDir += "Cpp11-"; -# endif - -# if defined(_DEBUG) - pluginDir += "Debug/"; -# else - pluginDir += "Release/"; -# endif -#endif - cout << "testing a simple plug-in... " << flush; try { diff --git a/cpp/test/Ice/plugin/Makefile b/cpp/test/Ice/plugin/Makefile deleted file mode 100644 index 7510559b51e..00000000000 --- a/cpp/test/Ice/plugin/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -LIBFILENAME = $(call mklibfilename,TestPlugin,$(VERSION)) -SONAME = $(call mksoname,TestPlugin,$(SOVERSION)) -LIBNAME = $(call mklibname,TestPlugin) -CLIENT = $(call mktestname,client) -PLUGINDIR = plugins - -TARGETS = $(CLIENT) \ - $(call mklibtargets,$(PLUGINDIR)/$(LIBFILENAME),$(PLUGINDIR)/$(SONAME),$(PLUGINDIR)/$(LIBNAME)) - -COBJS = Client.o \ - -POBJS = Plugin.o - -OBJS = $(COBJS) \ - $(POBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) - -$(PLUGINDIR)/$(LIBFILENAME): $(POBJS) - rm -f $@ - $(call mkshlib,$@,$(SONAME),$(POBJS),$(LIBS)) - -$(PLUGINDIR)/$(SONAME): $(PLUGINDIR)/$(LIBFILENAME) - rm -f $@ - ln -s $(LIBFILENAME) $@ - -$(PLUGINDIR)/$(LIBNAME): $(PLUGINDIR)/$(SONAME) - rm -f $@ - ln -s $(SONAME) $@ diff --git a/cpp/test/IceGrid/fileLock/Makefile b/cpp/test/Ice/plugin/Makefile.mk index 18851c503c3..0069ed01b1f 100644 --- a/cpp/test/IceGrid/fileLock/Makefile +++ b/cpp/test/Ice/plugin/Makefile.mk @@ -1,16 +1,14 @@ # ********************************************************************** # -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. # # This copy of Ice is licensed to you under the terms described in the # ICE_LICENSE file included in this distribution. # # ********************************************************************** -top_srcdir = ../../.. +$(test)_libraries := $(test)_TestPlugin -include $(top_srcdir)/config/Make.rules +$(test)_TestPlugin_sources := Plugin.cpp -clean:: - -rm -rf db/node db/registry db/replica-* - -rm -rf db/* +tests += $(test) diff --git a/cpp/test/Ice/plugin/run.py b/cpp/test/Ice/plugin/run.py index 4a57f94a040..604c9cec295 100755 --- a/cpp/test/Ice/plugin/run.py +++ b/cpp/test/Ice/plugin/run.py @@ -22,4 +22,4 @@ import TestUtil TestUtil.addAdditionalBinDirectories([os.path.join(os.getcwd(), TestUtil.getTestDirectory("testplugin"))]) client = os.path.join(os.getcwd(), TestUtil.getTestExecutable("client")) -TestUtil.simpleTest(client) +TestUtil.simpleTest(client, options=TestUtil.getTestDirectory("testplugin")) diff --git a/cpp/test/Ice/properties/.gitignore b/cpp/test/Ice/properties/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/Ice/properties/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/Ice/properties/Makefile b/cpp/test/Ice/properties/Makefile deleted file mode 100644 index 7da7a6f850f..00000000000 --- a/cpp/test/Ice/properties/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(LIBS)) diff --git a/cpp/test/Ice/proxy/.gitignore b/cpp/test/Ice/proxy/.gitignore deleted file mode 100644 index 725fdbfe47e..00000000000 --- a/cpp/test/Ice/proxy/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/proxy/Makefile b/cpp/test/Ice/proxy/Makefile deleted file mode 100644 index afc8034de86..00000000000 --- a/cpp/test/Ice/proxy/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o TestAMD.o - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServerAMD.o - -COLOBJS = Test.o \ - TestI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -# -# the long allTests function crashes when built with Sun CC 5.9 on x86 with -O, -# inlining and -KPIC; work-around: we disable PIC -# -GENPIC = no - - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include -I../../../src $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/retry/.gitignore b/cpp/test/Ice/retry/.gitignore deleted file mode 100644 index 21c2eee2b29..00000000000 --- a/cpp/test/Ice/retry/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -collocated -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/retry/Makefile b/cpp/test/Ice/retry/Makefile deleted file mode 100644 index 0f2aae3714a..00000000000 --- a/cpp/test/Ice/retry/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - InstrumentationI.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -COLOBJS = $(SLICE_OBJS) \ - TestI.o \ - Collocated.o \ - InstrumentationI.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/retry/Makefile.mk b/cpp/test/Ice/retry/Makefile.mk new file mode 100644 index 00000000000..58c23672643 --- /dev/null +++ b/cpp/test/Ice/retry/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = Client.cpp AllTests.cpp Test.ice InstrumentationI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/servantLocator/.gitignore b/cpp/test/Ice/servantLocator/.gitignore deleted file mode 100644 index 725fdbfe47e..00000000000 --- a/cpp/test/Ice/servantLocator/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -collocated -.depend -Test.cpp -TestAMD.cpp -Test.h -TestAMD.h diff --git a/cpp/test/Ice/servantLocator/Makefile b/cpp/test/Ice/servantLocator/Makefile deleted file mode 100644 index 1c4bcc3884b..00000000000 --- a/cpp/test/Ice/servantLocator/Makefile +++ /dev/null @@ -1,66 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) -COLLOCATED = $(call mktestname,collocated) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) $(COLLOCATED) - -SLICE_OBJS = Test.o \ - TestAMD.o - -COBJS = Test.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - TestI.o \ - ServantLocatorI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - TestAMDI.o \ - ServantLocatorI.o \ - ServerAMD.o - -COLOBJS = Test.o \ - TestI.o \ - ServantLocatorI.o \ - Collocated.o \ - AllTests.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) \ - $(COLOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) - -$(COLLOCATED): $(COLOBJS) - rm -f $@ - $(call mktest,$@,$(COLOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/servantLocator/Makefile.mk b/cpp/test/Ice/servantLocator/Makefile.mk new file mode 100644 index 00000000000..03930b68ec2 --- /dev/null +++ b/cpp/test/Ice/servantLocator/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = $(test-client-sources) ServantLocatorI.cpp +$(test)_server_sources = $(test-server-sources) ServantLocatorI.cpp +$(test)_serveramd_sources = $(test-server-sources) ServantLocatorI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/services/.gitignore b/cpp/test/Ice/services/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/services/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/services/Makefile b/cpp/test/Ice/services/Makefile deleted file mode 100644 index 857e2d10cf6..00000000000 --- a/cpp/test/Ice/services/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice Touch is licensed to you under the terms described in the -# ICE_TOUCH_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = Client.o \ - AllTests.o \ - $(SLICE_OBJS) - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lGlacier2$(libsuffix) -lIceStorm$(libsuffix) -lIceGrid$(libsuffix) $(LIBS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LIBS)) diff --git a/cpp/test/Ice/services/Makefile.mk b/cpp/test/Ice/services/Makefile.mk new file mode 100644 index 00000000000..7d7ff76732f --- /dev/null +++ b/cpp/test/Ice/services/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = Glacier2 IceStorm IceGrid Ice IceUtil TestCommon + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/Makefile b/cpp/test/Ice/slicing/Makefile deleted file mode 100644 index d4de3de68a2..00000000000 --- a/cpp/test/Ice/slicing/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = exceptions \ - objects - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Ice/slicing/exceptions/.gitignore b/cpp/test/Ice/slicing/exceptions/.gitignore deleted file mode 100644 index 756a3f6161a..00000000000 --- a/cpp/test/Ice/slicing/exceptions/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -.depend -Test.cpp -TestAMD.cpp -ClientPrivate.cpp -ServerPrivate.cpp -ServerPrivateAMD.cpp -Test.h -TestAMD.h -ClientPrivate.h -ServerPrivate.h -ServerPrivateAMD.h diff --git a/cpp/test/Ice/slicing/exceptions/Makefile b/cpp/test/Ice/slicing/exceptions/Makefile deleted file mode 100644 index 361292a4d26..00000000000 --- a/cpp/test/Ice/slicing/exceptions/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) - -SLICE_OBJS = Test.o TestAMD.o ClientPrivate.o ServerPrivate.o ServerPrivateAMD.o - -COBJS = Test.o \ - Client.o \ - ClientPrivate.o \ - AllTests.o - -SOBJS = Test.o \ - ServerPrivate.o \ - TestI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - ServerPrivateAMD.o \ - TestAMDI.o \ - ServerAMD.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) - -include $(top_srcdir)/config/Make.rules - -ICECPPFLAGS := -I. $(ICECPPFLAGS) - -CPPFLAGS := -I. -I../../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/slicing/exceptions/Makefile.mk b/cpp/test/Ice/slicing/exceptions/Makefile.mk new file mode 100644 index 00000000000..fc2c8e8460c --- /dev/null +++ b/cpp/test/Ice/slicing/exceptions/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/objects/.gitignore b/cpp/test/Ice/slicing/objects/.gitignore deleted file mode 100644 index 899ee01ff92..00000000000 --- a/cpp/test/Ice/slicing/objects/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -serveramd -.depend -Test.cpp -TestAMD.cpp -ClientPrivate.cpp -ServerPrivate.cpp -ServerPrivateAMD.cpp -Forward.cpp -Test.h -TestAMD.h -ClientPrivate.h -ServerPrivate.h -ServerPrivateAMD.h -Forward.h diff --git a/cpp/test/Ice/slicing/objects/Makefile b/cpp/test/Ice/slicing/objects/Makefile deleted file mode 100644 index 640d08a950d..00000000000 --- a/cpp/test/Ice/slicing/objects/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERAMD = $(call mktestname,serveramd) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERAMD) - -SLICE_OBJS = Test.o TestAMD.o ClientPrivate.o ServerPrivate.o ServerPrivateAMD.o - -COBJS = Test.o \ - ClientPrivate.o \ - Client.o \ - AllTests.o - -SOBJS = Test.o \ - ServerPrivate.o \ - TestI.o \ - Server.o - -SAMDOBJS = TestAMD.o \ - ServerPrivateAMD.o \ - TestAMDI.o \ - ServerAMD.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SAMDOBJS) - -# -# the long allTests function crashes when built with Sun CC 5.9 on x86 with -O, -# inlining and -KPIC; work-around: we disable PIC -# -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -ICECPPFLAGS := -I. $(ICECPPFLAGS) - -CPPFLAGS := -I. -I../../../include $(CPPFLAGS) - - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERAMD): $(SAMDOBJS) - rm -f $@ - $(call mktest,$@,$(SAMDOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/slicing/objects/Makefile.mk b/cpp/test/Ice/slicing/objects/Makefile.mk new file mode 100644 index 00000000000..fc2c8e8460c --- /dev/null +++ b/cpp/test/Ice/slicing/objects/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_sliceflags := -I$(test) +$(test)_client_sources = $(test-client-sources) ClientPrivate.ice +$(test)_server_sources = $(test-server-sources) ServerPrivate.ice +$(test)_serveramd_sources = $(test-serveramd-sources) ServerPrivateAMD.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/stream/.gitignore b/cpp/test/Ice/stream/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Ice/stream/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/stream/Makefile b/cpp/test/Ice/stream/Makefile deleted file mode 100644 index 18ae9db0ca3..00000000000 --- a/cpp/test/Ice/stream/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -OBJS = $(COBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPFLAGS := $(SLICE2CPPFLAGS) -I$(slicedir) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS) $(LIBS)) diff --git a/cpp/test/Ice/stringConverter/.gitignore b/cpp/test/Ice/stringConverter/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/stringConverter/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/stringConverter/Makefile b/cpp/test/Ice/stringConverter/Makefile deleted file mode 100644 index 9df661b03a5..00000000000 --- a/cpp/test/Ice/stringConverter/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o - -SOBJS = $(SLICE_OBJS) \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -LINKWITH := $(TEST_LIBS) $(ICONV_LIBS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(LINKWITH)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(LINKWITH)) diff --git a/cpp/test/Ice/stringConverter/Makefile.mk b/cpp/test/Ice/stringConverter/Makefile.mk new file mode 100644 index 00000000000..d7a508574e2 --- /dev/null +++ b/cpp/test/Ice/stringConverter/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libs = iconv + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/threadPoolPriority/.gitignore b/cpp/test/Ice/threadPoolPriority/.gitignore deleted file mode 100644 index ae1078237e7..00000000000 --- a/cpp/test/Ice/threadPoolPriority/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -servercustom -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/threadPoolPriority/Makefile b/cpp/test/Ice/threadPoolPriority/Makefile deleted file mode 100644 index 5cc9e2453fd..00000000000 --- a/cpp/test/Ice/threadPoolPriority/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) -SERVERCUSTOM = $(call mktestname,servercustom) - -TARGETS = $(CLIENT) $(SERVER) $(SERVERCUSTOM) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -SCOBJS = $(SLICE_OBJS) \ - ServerCustomThreadPool.o \ - TestI.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SCOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) - -$(SERVERCUSTOM): $(SCOBJS) - rm -f $@ - $(call mktest,$@,$(SCOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/threadPoolPriority/Makefile.mk b/cpp/test/Ice/threadPoolPriority/Makefile.mk new file mode 100644 index 00000000000..9a3cc06cc3c --- /dev/null +++ b/cpp/test/Ice/threadPoolPriority/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs := client server servercustom + +$(test)_servercustom_sources := ServerCustomThreadPool.cpp Test.ice TestI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/timeout/.gitignore b/cpp/test/Ice/timeout/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/timeout/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index b21132c6af7..1aeea30adc0 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -195,7 +195,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Expect InvocationTimeoutException. // TimeoutPrxPtr to = ICE_UNCHECKED_CAST(TimeoutPrx, obj->ice_invocationTimeout(100)); - + #ifdef ICE_CPP11_MAPPING auto f = to->sleep_async(750); try @@ -462,7 +462,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Keep the server thread pool busy. #ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleep_async(300); + timeout->ice_invocationTimeout(-1)->sleep_async(300); #else timeout->ice_invocationTimeout(-1)->begin_sleep(300); #endif @@ -481,7 +481,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Keep the server thread pool busy. #ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleep_async(300); + timeout->ice_invocationTimeout(-1)->sleep_async(300); #else timeout->ice_invocationTimeout(-1)->begin_sleep(300); #endif diff --git a/cpp/test/Ice/timeout/Makefile b/cpp/test/Ice/timeout/Makefile deleted file mode 100644 index 6a7c14646f7..00000000000 --- a/cpp/test/Ice/timeout/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - TestI.o \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(TEST_LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(TEST_LIBS)) diff --git a/cpp/test/Ice/timeout/Makefile.mk b/cpp/test/Ice/timeout/Makefile.mk new file mode 100644 index 00000000000..848af22c5b3 --- /dev/null +++ b/cpp/test/Ice/timeout/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources = $(test-client-sources) TestI.cpp + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Ice/udp/.gitignore b/cpp/test/Ice/udp/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/Ice/udp/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/Ice/udp/Makefile b/cpp/test/Ice/udp/Makefile deleted file mode 100644 index 7ab5e22ec06..00000000000 --- a/cpp/test/Ice/udp/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS), $(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS), $(LIBS)) diff --git a/cpp/test/IceBox/Makefile b/cpp/test/IceBox/Makefile deleted file mode 100644 index d5b420f81a8..00000000000 --- a/cpp/test/IceBox/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = admin configuration - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceBox/admin/.gitignore b/cpp/test/IceBox/admin/.gitignore deleted file mode 100644 index 03484b5178b..00000000000 --- a/cpp/test/IceBox/admin/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -libTestService.* -.depend -Test.cpp -Test.h diff --git a/cpp/test/IceBox/admin/Makefile b/cpp/test/IceBox/admin/Makefile deleted file mode 100644 index 422c5905099..00000000000 --- a/cpp/test/IceBox/admin/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -SVCFILENAME = $(call mklibfilename,TestService) -SVCSONAME = $(call mksoname,TestService) - -TARGETS = $(CLIENT) $(SVCFILENAME) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SERVICE_OBJS = $(SLICE_OBJS) \ - TestI.o \ - Service.o - -OBJS = $(COBJS) \ - $(SERVICE_OBJS) \ - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SVCFILENAME): $(SERVICE_OBJS) - rm -f $@ - $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), -lIceBox $(LIBS)) diff --git a/cpp/test/IceBox/admin/Makefile.mk b/cpp/test/IceBox/admin/Makefile.mk new file mode 100644 index 00000000000..6cd4d36590c --- /dev/null +++ b/cpp/test/IceBox/admin/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestService + +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox + +tests += $(test) diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore deleted file mode 100644 index 03484b5178b..00000000000 --- a/cpp/test/IceBox/configuration/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -libTestService.* -.depend -Test.cpp -Test.h diff --git a/cpp/test/IceBox/configuration/Makefile b/cpp/test/IceBox/configuration/Makefile deleted file mode 100644 index b7a0d13b9b4..00000000000 --- a/cpp/test/IceBox/configuration/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -SVCFILENAME = $(call mklibfilename,TestService) -SVCSONAME = $(call mksoname,TestService) - -TARGETS = $(CLIENT) $(SVCFILENAME) - -SLICE_OBJS = Test.o \ - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SERVICE_OBJS = $(SLICE_OBJS) \ - TestI.o \ - Service.o - -OBJS = $(COBJS) \ - $(SERVICE_OBJS) \ - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -$(SVCFILENAME): $(SERVICE_OBJS) - rm -f $@ - $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), -lIceBox $(LIBS)) diff --git a/cpp/test/IceBox/configuration/Makefile.mk b/cpp/test/IceBox/configuration/Makefile.mk new file mode 100644 index 00000000000..6cd4d36590c --- /dev/null +++ b/cpp/test/IceBox/configuration/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestService + +$(test)_TestService_sources = TestI.cpp Service.cpp Test.ice +$(test)_TestService_dependencies = IceBox + +tests += $(test) diff --git a/cpp/test/IceDiscovery/Makefile b/cpp/test/IceDiscovery/Makefile deleted file mode 100644 index aa34d330b4e..00000000000 --- a/cpp/test/IceDiscovery/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = simple - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceDiscovery/simple/.gitignore b/cpp/test/IceDiscovery/simple/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/IceDiscovery/simple/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/IceDiscovery/simple/Makefile b/cpp/test/IceDiscovery/simple/Makefile deleted file mode 100644 index ffff74f3bef..00000000000 --- a/cpp/test/IceDiscovery/simple/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -ifneq ($(findstring MINGW,$(UNAME)),) -ICEDISOVERY_LIBS = -licediscovery$(SOVERSION)$(COMPSUFFIX) -else -ICEDISOVERY_LIBS = -lIceDiscovery -endif - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS), $(ICEDISOVERY_LIBS) $(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS), $(LIBS)) diff --git a/cpp/test/IceDiscovery/simple/Makefile.mk b/cpp/test/IceDiscovery/simple/Makefile.mk new file mode 100644 index 00000000000..70d52e49241 --- /dev/null +++ b/cpp/test/IceDiscovery/simple/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = IceDiscovery Ice IceUtil TestCommon + +tests += $(test) diff --git a/cpp/test/IceGrid/Makefile b/cpp/test/IceGrid/Makefile deleted file mode 100644 index 3fb791c229b..00000000000 --- a/cpp/test/IceGrid/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = simple \ - deployer \ - session \ - update \ - noRestartUpdate \ - activation \ - replicaGroup \ - allocation \ - replication \ - distribution \ - admin \ - fileLock - - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceGrid/activation/.gitignore b/cpp/test/IceGrid/activation/.gitignore deleted file mode 100644 index 1593c12731f..00000000000 --- a/cpp/test/IceGrid/activation/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/activation/Makefile b/cpp/test/IceGrid/activation/Makefile deleted file mode 100644 index b53cb8cd42e..00000000000 --- a/cpp/test/IceGrid/activation/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceGrid -lGlacier2 - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/activation/Makefile.mk b/cpp/test/IceGrid/activation/Makefile.mk new file mode 100644 index 00000000000..e6d709446a3 --- /dev/null +++ b/cpp/test/IceGrid/activation/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/admin/.gitignore b/cpp/test/IceGrid/admin/.gitignore deleted file mode 100644 index 6d52720534e..00000000000 --- a/cpp/test/IceGrid/admin/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -server -.depend -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/admin/Makefile b/cpp/test/IceGrid/admin/Makefile deleted file mode 100644 index fc72c125a3b..00000000000 --- a/cpp/test/IceGrid/admin/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -SERVER = server - -TARGETS = $(SERVER) - -OBJS = Server.o - -include $(top_srcdir)/config/Make.rules - -$(SERVER): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/allocation/.gitignore b/cpp/test/IceGrid/allocation/.gitignore deleted file mode 100644 index b38ad0a165c..00000000000 --- a/cpp/test/IceGrid/allocation/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -verifier -.depend -Test.cpp -Test.h -db/node -db/registry -db/node-1 -db/node-2 -db/replica-* diff --git a/cpp/test/IceGrid/allocation/Makefile b/cpp/test/IceGrid/allocation/Makefile deleted file mode 100644 index df6b8a017cf..00000000000 --- a/cpp/test/IceGrid/allocation/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -VERIFIER = verifier - -TARGETS = $(CLIENT) $(SERVER) $(VERIFIER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -VOBJS = PermissionsVerifier.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(VOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(VERIFIER): $(VOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS) - -clean:: - -rm -rf db/node db/registry db/node-1 db/node-2 db/replica-* diff --git a/cpp/test/IceGrid/allocation/Makefile.mk b/cpp/test/IceGrid/allocation/Makefile.mk new file mode 100644 index 00000000000..1652a427cf5 --- /dev/null +++ b/cpp/test/IceGrid/allocation/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = client server verifier + +$(test)_client_dependencies = IceGrid Glacier2 + +$(test)_verifier_sources = PermissionsVerifier.cpp +$(test)_verifier_dependencies = Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/deployer/.gitignore b/cpp/test/IceGrid/deployer/.gitignore deleted file mode 100644 index acaef95b2cd..00000000000 --- a/cpp/test/IceGrid/deployer/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -libTestService.* -.depend -Test.cpp -Test.h -build.txt -log1.txt -log2.txt -log3.txt -log4.txt -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/deployer/Makefile b/cpp/test/IceGrid/deployer/Makefile deleted file mode 100644 index 4c09704a646..00000000000 --- a/cpp/test/IceGrid/deployer/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -SVCFILENAME = $(call mklibfilename,TestService) -SVCSONAME = $(call mksoname,TestService) - -TARGETS = $(CLIENT) $(SERVER) $(SVCFILENAME) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -SERVICE_OBJS = $(SLICE_OBJS) \ - TestI.o \ - Service.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SERVICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(SVCFILENAME): $(SERVICE_OBJS) - rm -f $@ - $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), -lIceBox $(LIBS)) - -clean:: - -rm -f build.txt log1.txt log2.txt log3.txt log4.txt - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/deployer/Makefile.mk b/cpp/test/IceGrid/deployer/Makefile.mk new file mode 100644 index 00000000000..7f1d5393f84 --- /dev/null +++ b/cpp/test/IceGrid/deployer/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestService + +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_dependencies = IceBox + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/distribution/.gitignore b/cpp/test/IceGrid/distribution/.gitignore deleted file mode 100644 index 77c4fb4d540..00000000000 --- a/cpp/test/IceGrid/distribution/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h -db/node -db/registry -db/node-1 -db/node-2 -db/replica-* diff --git a/cpp/test/IceGrid/distribution/Makefile b/cpp/test/IceGrid/distribution/Makefile deleted file mode 100644 index b02c928c898..00000000000 --- a/cpp/test/IceGrid/distribution/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/node-1 db/node-2 db/replica-* diff --git a/cpp/test/IceGrid/distribution/Makefile.mk b/cpp/test/IceGrid/distribution/Makefile.mk new file mode 100644 index 00000000000..e6d709446a3 --- /dev/null +++ b/cpp/test/IceGrid/distribution/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/noRestartUpdate/.gitignore b/cpp/test/IceGrid/noRestartUpdate/.gitignore deleted file mode 100644 index 1a26f311e2a..00000000000 --- a/cpp/test/IceGrid/noRestartUpdate/.gitignore +++ /dev/null @@ -1,15 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -libTestService.* -.depend -Test.cpp -Test.h -db/node -db/registry -db/node-1 -db/node-2 -db/replica-* diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp index 1616e8be39b..6e0f5ebe0b0 100644 --- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp @@ -527,7 +527,7 @@ allTests(const Ice::CommunicatorPtr& communicator) addProperty(service, "Ice.Warn.UnknownProperties", "0"); //addProperty(service, "Ice.Trace.Admin.Properties", "1"); service->name = "Service1"; - service->entry = "./TestService:create"; + service->entry = properties->getProperty("ServerDir") + "/TestService:create"; adapter = AdapterDescriptor(); adapter.name = "${service}"; adapter.id = "${server}.${service}"; @@ -631,7 +631,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing service update... " << flush; try { - icebox->services[0].descriptor->entry = "TestService:create2"; + icebox->services[0].descriptor->entry = properties->getProperty("ServerDir") + "/TestService:create2"; admin->updateApplicationWithoutRestart(update); test(false); } diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile b/cpp/test/IceGrid/noRestartUpdate/Makefile deleted file mode 100644 index ea7e3845ea3..00000000000 --- a/cpp/test/IceGrid/noRestartUpdate/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -SVCFILENAME = $(call mklibfilename,TestService) -SVCSONAME = $(call mksoname,TestService) - -TARGETS = $(CLIENT) $(SERVER) $(SVCFILENAME) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -SERVICE_OBJS = $(SLICE_OBJS) \ - TestI.o \ - Service.o - -OBJS = $(COBJS) \ - $(SOBJS) \ - $(SERVICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(SVCFILENAME): $(SERVICE_OBJS) - rm -f $@ - $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), -lIceBox $(LIBS)) - -clean:: - -rm -rf db/node db/registry db/node-1 db/node-2 db/replica-* diff --git a/cpp/test/IceGrid/noRestartUpdate/Makefile.mk b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk new file mode 100644 index 00000000000..7f1d5393f84 --- /dev/null +++ b/cpp/test/IceGrid/noRestartUpdate/Makefile.mk @@ -0,0 +1,17 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestService + +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_dependencies = IceBox + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/replicaGroup/.gitignore b/cpp/test/IceGrid/replicaGroup/.gitignore deleted file mode 100644 index 18519db5234..00000000000 --- a/cpp/test/IceGrid/replicaGroup/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -libTestService.* -.depend -Test.cpp -Test.h -build.txt -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/replicaGroup/Makefile b/cpp/test/IceGrid/replicaGroup/Makefile deleted file mode 100644 index 4a80ef5d9bc..00000000000 --- a/cpp/test/IceGrid/replicaGroup/Makefile +++ /dev/null @@ -1,70 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -SVCFILENAME = $(call mklibfilename,TestService) -SVCSONAME = $(call mksoname,TestService) - -PLUGINFILENAME = $(call mklibfilename,RegistryPlugin,$(VERSION)) -PLUGINSONAME = $(call mksoname,RegistryPlugin,$(SOVERSION)) - -TARGETS = $(CLIENT) $(SERVER) $(SVCFILENAME) $(call mklibtargets,$(PLUGINFILENAME),$(PLUGINSONAME)) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -POBJS = RegistryPlugin.o - -SERVICE_OBJS = $(SLICE_OBJS) \ - TestI.o \ - Service.o - -OBJS = $(COBJS) \ - $(POBJS) \ - $(SOBJS) \ - $(SERVICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(SVCFILENAME): $(SERVICE_OBJS) - rm -f $@ - $(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS),-lIceBox $(LIBS)) - -$(PLUGINFILENAME): $(POBJS) - rm -f $@ - $(call mkshlib,$@,$(PLUGINSONAME),$(POBJS),-lIceGrid -lGlacier2 $(LIBS)) - -$(PLUGINSONAME): $(PLUGINFILENAME) - rm -f $@ - ln -s $(PLUGINFILENAME) $@ - -clean:: - -rm -f build.txt - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/replicaGroup/Makefile.mk b/cpp/test/IceGrid/replicaGroup/Makefile.mk new file mode 100644 index 00000000000..c386a07119b --- /dev/null +++ b/cpp/test/IceGrid/replicaGroup/Makefile.mk @@ -0,0 +1,20 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_libraries := $(test)_TestService $(test)_RegistryPlugin + +$(test)_TestService_sources = Service.cpp TestI.cpp Test.ice +$(test)_TestService_dependencies = IceBox + +$(test)_RegistryPlugin_sources = RegistryPlugin.cpp +$(test)_RegistryPlugin_dependencies = IceGrid Glacier2 + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/replication/.gitignore b/cpp/test/IceGrid/replication/.gitignore deleted file mode 100644 index a2fb0ecc07c..00000000000 --- a/cpp/test/IceGrid/replication/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h -build.txt -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/replication/Makefile b/cpp/test/IceGrid/replication/Makefile deleted file mode 100644 index 9c5212f1898..00000000000 --- a/cpp/test/IceGrid/replication/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 -lIceBox $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/replication/Makefile.mk b/cpp/test/IceGrid/replication/Makefile.mk new file mode 100644 index 00000000000..e6d709446a3 --- /dev/null +++ b/cpp/test/IceGrid/replication/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/session/.gitignore b/cpp/test/IceGrid/session/.gitignore deleted file mode 100644 index c975494fe1e..00000000000 --- a/cpp/test/IceGrid/session/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -verifier -.depend -Test.cpp -Test.h -db/node -db/registry -db/node-1 -db/replica-* diff --git a/cpp/test/IceGrid/session/Makefile b/cpp/test/IceGrid/session/Makefile deleted file mode 100644 index 570cc59c394..00000000000 --- a/cpp/test/IceGrid/session/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server -VERIFIER = verifier - -TARGETS = $(CLIENT) $(SERVER) $(VERIFIER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - Server.o - -VOBJS = $(SLICE_OBJS) \ - PermissionsVerifier.o - -OBJS = $(COBJS) \ - $(VOBJS) \ - $(SOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) - -$(VERIFIER): $(VOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(VOBJS) -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) -lGlacier2 $(ICESSL_LIBS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/node-1 db/replica-* diff --git a/cpp/test/IceGrid/session/Makefile.mk b/cpp/test/IceGrid/session/Makefile.mk new file mode 100644 index 00000000000..20495324dd7 --- /dev/null +++ b/cpp/test/IceGrid/session/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = client server verifier + +$(test)_client_dependencies = IceGrid Glacier2 + +$(test)_server_dependencies = Glacier2 IceSSL + +$(test)_verifier_sources = PermissionsVerifier.cpp Test.ice +$(test)_verifier_dependencies = Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/simple/.gitignore b/cpp/test/IceGrid/simple/.gitignore deleted file mode 100644 index 1593c12731f..00000000000 --- a/cpp/test/IceGrid/simple/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h -db/node -db/registry -db/replica-* diff --git a/cpp/test/IceGrid/simple/Makefile b/cpp/test/IceGrid/simple/Makefile deleted file mode 100644 index 3929465ce17..00000000000 --- a/cpp/test/IceGrid/simple/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) -lIceLocatorDiscovery -lIceGrid -lGlacier2 - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/replica-* diff --git a/cpp/test/IceGrid/simple/Makefile.mk b/cpp/test/IceGrid/simple/Makefile.mk new file mode 100644 index 00000000000..c8346e72030 --- /dev/null +++ b/cpp/test/IceGrid/simple/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = IceLocatorDiscovery IceGrid Glacier2 Ice IceUtil TestCommon + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceGrid/update/.gitignore b/cpp/test/IceGrid/update/.gitignore deleted file mode 100644 index 77c4fb4d540..00000000000 --- a/cpp/test/IceGrid/update/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h -db/node -db/registry -db/node-1 -db/node-2 -db/replica-* diff --git a/cpp/test/IceGrid/update/Makefile b/cpp/test/IceGrid/update/Makefile deleted file mode 100644 index 59a334244fd..00000000000 --- a/cpp/test/IceGrid/update/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client -SERVER = server - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) -lIceGrid -lGlacier2 $(LIBS) - -$(SERVER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -rf db/node db/registry db/node-1 db/node-2 db/replica-* diff --git a/cpp/test/IceGrid/update/Makefile.mk b/cpp/test/IceGrid/update/Makefile.mk new file mode 100644 index 00000000000..e6d709446a3 --- /dev/null +++ b/cpp/test/IceGrid/update/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_dependencies = IceGrid Glacier2 + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceSSL/Makefile b/cpp/test/IceSSL/Makefile deleted file mode 100644 index 94e3a98a5ec..00000000000 --- a/cpp/test/IceSSL/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = configuration - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceSSL/configuration/.gitignore b/cpp/test/IceSSL/configuration/.gitignore deleted file mode 100644 index 3a3aae35bd8..00000000000 --- a/cpp/test/IceSSL/configuration/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -server -.depend -Test.cpp -Test.h diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 741e392914c..3fc92e581f1 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -3252,8 +3252,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b } catch(const Ice::LocalException& ex) { - cerr << ex << endl; - test(false); + cerr << "warning: unable to connect to demo.zeroc.com to check system CA:\n" << ex << endl; } comm->destroy(); } diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile deleted file mode 100644 index 1c5d24f1cdf..00000000000 --- a/cpp/test/IceSSL/configuration/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) -SERVER = $(call mktestname,server) - -TARGETS = $(CLIENT) $(SERVER) - -SLICE_OBJS = Test.o - -COBJS = $(SLICE_OBJS) \ - Client.o \ - AllTests.o - -SOBJS = $(SLICE_OBJS) \ - TestI.o \ - Server.o - -OBJS = $(COBJS) \ - $(SOBJS) - -GENPIC = no - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -ifeq ($(UNAME),Darwin) -LINK_WITH = -framework Security -framework CoreFoundation -endif - -ifeq ($(UNAME),MINGW) -LINK_WITH = $(SSL_OS_LIBS) -endif - -$(CLIENT): $(COBJS) - rm -f $@ - $(call mktest,$@,$(COBJS),$(ICESSL_LIBS) $(LINK_WITH) $(LIBS)) - -$(SERVER): $(SOBJS) - rm -f $@ - $(call mktest,$@,$(SOBJS),$(ICESSL_LIBS) $(LINK_WITH) $(LIBS)) diff --git a/cpp/test/IceSSL/configuration/Makefile.mk b/cpp/test/IceSSL/configuration/Makefile.mk new file mode 100644 index 00000000000..b0c9b1f2ab1 --- /dev/null +++ b/cpp/test/IceSSL/configuration/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = IceSSL Ice IceUtil TestCommon + +tests += $(test) diff --git a/cpp/test/IceStorm/Makefile b/cpp/test/IceStorm/Makefile deleted file mode 100644 index 2303b98b33f..00000000000 --- a/cpp/test/IceStorm/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = single \ - federation \ - federation2 \ - stress \ - rep1 \ - repstress \ - repgrid - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceStorm/federation/.gitignore b/cpp/test/IceStorm/federation/.gitignore deleted file mode 100644 index 9f3e354edb6..00000000000 --- a/cpp/test/IceStorm/federation/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/federation/Makefile b/cpp/test/IceStorm/federation/Makefile deleted file mode 100644 index e8cf7ba8a00..00000000000 --- a/cpp/test/IceStorm/federation/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/federation/Makefile.mk b/cpp/test/IceStorm/federation/Makefile.mk new file mode 100644 index 00000000000..de316f2bbda --- /dev/null +++ b/cpp/test/IceStorm/federation/Makefile.mk @@ -0,0 +1,18 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/federation2/.gitignore b/cpp/test/IceStorm/federation2/.gitignore deleted file mode 100644 index 1ee63744e74..00000000000 --- a/cpp/test/IceStorm/federation2/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -db2/* -0.db/* -0.db2/* -1.db/* -1.db2/* -2.db/* -2.db2/* diff --git a/cpp/test/IceStorm/federation2/Makefile b/cpp/test/IceStorm/federation2/Makefile deleted file mode 100644 index ee6e5920c72..00000000000 --- a/cpp/test/IceStorm/federation2/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* db2/* - -rm -rf 0.db/* 0.db2/* - -rm -rf 1.db/* 1.db2/* - -rm -rf 2.db/* 2.db2/* diff --git a/cpp/test/IceStorm/federation2/Makefile.mk b/cpp/test/IceStorm/federation2/Makefile.mk new file mode 100644 index 00000000000..012bbe6da48 --- /dev/null +++ b/cpp/test/IceStorm/federation2/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +$(test)_cleanfiles = db/* 0.db/* 1.db/* 2.db/* db2/* 0.db2/* 1.db2/* 2.db2/* + + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/rep1/.gitignore b/cpp/test/IceStorm/rep1/.gitignore deleted file mode 100644 index 9cd9b7ec547..00000000000 --- a/cpp/test/IceStorm/rep1/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -sub -.depend -Single.cpp -Single.h -build.txt -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/rep1/Makefile b/cpp/test/IceStorm/rep1/Makefile deleted file mode 100644 index eb010ab56c7..00000000000 --- a/cpp/test/IceStorm/rep1/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber -SUB = sub - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(SUB) - -SLICE_OBJS = Single.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -SUB_OBJS = $(SLICE_OBJS) \ - Sub.o - -OBJS = $(SUB_OBJS) \ - $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(SUB): $(SUB_OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SUB_OBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/rep1/Makefile.mk b/cpp/test/IceStorm/rep1/Makefile.mk new file mode 100644 index 00000000000..5155cc324f6 --- /dev/null +++ b/cpp/test/IceStorm/rep1/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber sub +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice +$(test)_sub_sources = Sub.cpp Single.ice + +$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repgrid/.gitignore b/cpp/test/IceStorm/repgrid/.gitignore deleted file mode 100644 index 6c0d77be0e0..00000000000 --- a/cpp/test/IceStorm/repgrid/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Single.cpp -Single.h -build.txt -db/node/* -db/registry/* -db/replica-1/* diff --git a/cpp/test/IceStorm/repgrid/Makefile b/cpp/test/IceStorm/repgrid/Makefile deleted file mode 100644 index b04cd70822b..00000000000 --- a/cpp/test/IceStorm/repgrid/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = client - -TARGETS = $(CLIENT) - -SLICE_OBJS = Single.o - -OBJS = $(SLICE_OBJS) \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(OBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/node/* db/registry/* db/replica-1/* diff --git a/cpp/test/IceStorm/repgrid/Makefile.mk b/cpp/test/IceStorm/repgrid/Makefile.mk new file mode 100644 index 00000000000..437b6c6b36f --- /dev/null +++ b/cpp/test/IceStorm/repgrid/Makefile.mk @@ -0,0 +1,14 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_client_sources = Client.cpp Single.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/repstress/.gitignore b/cpp/test/IceStorm/repstress/.gitignore deleted file mode 100644 index c1e2c6ba18a..00000000000 --- a/cpp/test/IceStorm/repstress/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -control -.depend -Single.cpp -Controller.cpp -Single.h -Controller.h -build.txt -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/repstress/Makefile b/cpp/test/IceStorm/repstress/Makefile deleted file mode 100644 index 003e1b5894f..00000000000 --- a/cpp/test/IceStorm/repstress/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber -CONTROL = control - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) $(CONTROL) - -SLICE_OBJS = Single.o \ - Controller.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -COBJS = Control.o \ - Controller.o - -OBJS = $(COBJS) \ - $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -$(CONTROL): $(COBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(COBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/repstress/Makefile.mk b/cpp/test/IceStorm/repstress/Makefile.mk new file mode 100644 index 00000000000..63d03c56fb7 --- /dev/null +++ b/cpp/test/IceStorm/repstress/Makefile.mk @@ -0,0 +1,19 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber control +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice Controller.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice Controller.ice +$(test)_control_sources = Control.cpp Controller.ice + +$(test)_cleanfiles = 0.db/* 1.db/* 2.db/* + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/single/.gitignore b/cpp/test/IceStorm/single/.gitignore deleted file mode 100644 index 7245563774f..00000000000 --- a/cpp/test/IceStorm/single/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Single.cpp -Single.h -build.txt -db/* -0.db/* -1.db/* -2.db/* diff --git a/cpp/test/IceStorm/single/Makefile b/cpp/test/IceStorm/single/Makefile deleted file mode 100644 index 5f138a38892..00000000000 --- a/cpp/test/IceStorm/single/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Single.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) $(NO_DEPRECATED_FLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* - -rm -rf 0.db/* - -rm -rf 1.db/* - -rm -rf 2.db/* diff --git a/cpp/test/IceStorm/single/Makefile.mk b/cpp/test/IceStorm/single/Makefile.mk new file mode 100644 index 00000000000..60694e4883d --- /dev/null +++ b/cpp/test/IceStorm/single/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Single.ice +$(test)_subscriber_sources = Subscriber.cpp Single.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceStorm/stress/.gitignore b/cpp/test/IceStorm/stress/.gitignore deleted file mode 100644 index 1ee63744e74..00000000000 --- a/cpp/test/IceStorm/stress/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -publisher -subscriber -.depend -Event.cpp -Event.h -build.txt -db/* -db2/* -0.db/* -0.db2/* -1.db/* -1.db2/* -2.db/* -2.db2/* diff --git a/cpp/test/IceStorm/stress/Makefile b/cpp/test/IceStorm/stress/Makefile deleted file mode 100644 index ee6e5920c72..00000000000 --- a/cpp/test/IceStorm/stress/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -PUBLISHER = publisher -SUBSCRIBER = subscriber - -TARGETS = $(PUBLISHER) $(SUBSCRIBER) - -SLICE_OBJS = Event.o - -POBJS = $(SLICE_OBJS) \ - Publisher.o - -SOBJS = $(SLICE_OBJS) \ - Subscriber.o - -OBJS = $(POBJS) \ - $(SOBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -LIBS := -lIceStorm $(LIBS) - -$(PUBLISHER): $(POBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(POBJS) $(LIBS) - -$(SUBSCRIBER): $(SOBJS) - rm -f $@ - $(CXX) $(LDFLAGS) $(LDEXEFLAGS) -o $@ $(SOBJS) $(LIBS) - -clean:: - -rm -f build.txt - -rm -rf db/* db2/* - -rm -rf 0.db/* 0.db2/* - -rm -rf 1.db/* 1.db2/* - -rm -rf 2.db/* 2.db2/* diff --git a/cpp/test/IceStorm/stress/Makefile.mk b/cpp/test/IceStorm/stress/Makefile.mk new file mode 100644 index 00000000000..96cfdfccc30 --- /dev/null +++ b/cpp/test/IceStorm/stress/Makefile.mk @@ -0,0 +1,16 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = publisher subscriber +$(test)_dependencies = IceStorm Ice IceUtil TestCommon + +$(test)_publisher_sources = Publisher.cpp Event.ice +$(test)_subscriber_sources = Subscriber.cpp Event.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/IceUtil/Makefile b/cpp/test/IceUtil/Makefile deleted file mode 100644 index 5a5c965811a..00000000000 --- a/cpp/test/IceUtil/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = condvar \ - thread \ - unicode \ - inputUtil \ - uuid \ - ctrlCHandler \ - timer \ - priority \ - sha1 \ - stacktrace - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/IceUtil/condvar/.gitignore b/cpp/test/IceUtil/condvar/.gitignore deleted file mode 100644 index 4498983a9de..00000000000 --- a/cpp/test/IceUtil/condvar/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -workqueue -match -.depend diff --git a/cpp/test/IceUtil/condvar/Makefile b/cpp/test/IceUtil/condvar/Makefile deleted file mode 100644 index f6ecb0dd547..00000000000 --- a/cpp/test/IceUtil/condvar/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -WQ = $(call mktestname,workqueue) -MATCH = $(call mktestname,match) - -TARGETS = $(WQ) $(MATCH) - -OBJS = WorkQueue.o \ - Match.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(WQ): WorkQueue.o - rm -f $@ - $(call mktest,$@,WorkQueue.o,$(BASELIBS)) - -$(MATCH): Match.o - rm -f $@ - $(call mktest,$@,Match.o,$(BASELIBS)) diff --git a/cpp/test/IceUtil/condvar/Makefile.mk b/cpp/test/IceUtil/condvar/Makefile.mk new file mode 100644 index 00000000000..ef556eae645 --- /dev/null +++ b/cpp/test/IceUtil/condvar/Makefile.mk @@ -0,0 +1,15 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_programs = workqueue match + +$(test)_workqueue_sources = WorkQueue.cpp +$(test)_match_sources = Match.cpp + +tests += $(test) diff --git a/cpp/test/IceUtil/ctrlCHandler/.gitignore b/cpp/test/IceUtil/ctrlCHandler/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/ctrlCHandler/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile b/cpp/test/IceUtil/ctrlCHandler/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/ctrlCHandler/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/ctrlCHandler/Makefile.mk b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk new file mode 100644 index 00000000000..d2263b8262a --- /dev/null +++ b/cpp/test/IceUtil/ctrlCHandler/Makefile.mk @@ -0,0 +1,10 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +tests += $(test) diff --git a/cpp/test/IceUtil/inputUtil/.gitignore b/cpp/test/IceUtil/inputUtil/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/inputUtil/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/inputUtil/Makefile b/cpp/test/IceUtil/inputUtil/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/inputUtil/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/priority/.gitignore b/cpp/test/IceUtil/priority/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/priority/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/priority/Makefile b/cpp/test/IceUtil/priority/Makefile deleted file mode 100644 index 607503a9419..00000000000 --- a/cpp/test/IceUtil/priority/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = TestBase.o \ - ThreadPriority.o \ - TimerPriority.o \ - PriorityInversion.o \ - TestSuite.o \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/priority/Makefile.mk b/cpp/test/IceUtil/priority/Makefile.mk new file mode 100644 index 00000000000..904c9e358d1 --- /dev/null +++ b/cpp/test/IceUtil/priority/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp)) + +tests += $(test) diff --git a/cpp/test/IceUtil/sha1/.gitignore b/cpp/test/IceUtil/sha1/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/sha1/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/sha1/Makefile b/cpp/test/IceUtil/sha1/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/sha1/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/stacktrace/.gitignore b/cpp/test/IceUtil/stacktrace/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/stacktrace/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/stacktrace/Makefile b/cpp/test/IceUtil/stacktrace/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/stacktrace/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/thread/.gitignore b/cpp/test/IceUtil/thread/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/thread/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/thread/Makefile b/cpp/test/IceUtil/thread/Makefile deleted file mode 100644 index 62b7c89ae91..00000000000 --- a/cpp/test/IceUtil/thread/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = TestBase.o \ - CreateTest.o \ - AliveTest.o \ - StartTest.o \ - SleepTest.o \ - RecMutexTest.o \ - MutexTest.o \ - MonitorMutexTest.o \ - MonitorRecMutexTest.o \ - CountDownLatchTest.o \ - TestSuite.o \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/thread/Makefile.mk b/cpp/test/IceUtil/thread/Makefile.mk new file mode 100644 index 00000000000..904c9e358d1 --- /dev/null +++ b/cpp/test/IceUtil/thread/Makefile.mk @@ -0,0 +1,12 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_client_sources := $(notdir $(wildcard $(currentdir)/*.cpp)) + +tests += $(test) diff --git a/cpp/test/IceUtil/timer/.gitignore b/cpp/test/IceUtil/timer/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/timer/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/timer/Makefile b/cpp/test/IceUtil/timer/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/timer/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/unicode/.gitignore b/cpp/test/IceUtil/unicode/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/unicode/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/unicode/Makefile b/cpp/test/IceUtil/unicode/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/unicode/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/IceUtil/uuid/.gitignore b/cpp/test/IceUtil/uuid/.gitignore deleted file mode 100644 index f715a76859d..00000000000 --- a/cpp/test/IceUtil/uuid/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend diff --git a/cpp/test/IceUtil/uuid/Makefile b/cpp/test/IceUtil/uuid/Makefile deleted file mode 100644 index 9f992a300a4..00000000000 --- a/cpp/test/IceUtil/uuid/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -OBJS = Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(BASELIBS)) diff --git a/cpp/test/Makefile b/cpp/test/Makefile deleted file mode 100644 index 2669b195948..00000000000 --- a/cpp/test/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = .. - -include $(top_srcdir)/config/Make.rules - -ifeq ($(CPP11_MAPPING),yes) -SUBDIRS = Common \ - IceUtil \ - Slice \ - Ice \ - IceSSL \ - IceDiscovery \ - IceBox -else - -SUBDIRS = Common \ - IceUtil \ - Slice \ - Ice \ - IceSSL \ - IceDiscovery - -ifeq ($(findstring MINGW,$(UNAME)),) -SUBDIRS := $(SUBDIRS) \ - IceBox \ - IceStorm \ - Glacier2 \ - IceGrid -endif - -endif - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Slice/Makefile b/cpp/test/Slice/Makefile deleted file mode 100644 index afae4a05cd8..00000000000 --- a/cpp/test/Slice/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../.. - -include $(top_srcdir)/config/Make.rules - -SUBDIRS = keyword \ - parser \ - structure \ - macros - -.PHONY: $(EVERYTHING) $(SUBDIRS) - -all:: $(SUBDIRS) - -$(SUBDIRS): - @echo "making all in $@" - @$(MAKE) all --directory=$@ - - -$(EVERYTHING_EXCEPT_ALL):: - @for subdir in $(SUBDIRS); \ - do \ - echo "making $@ in $$subdir"; \ - ( cd $$subdir && $(MAKE) $@ ) || exit 1; \ - done diff --git a/cpp/test/Slice/keyword/.gitignore b/cpp/test/Slice/keyword/.gitignore deleted file mode 100644 index b6ac5c9979a..00000000000 --- a/cpp/test/Slice/keyword/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Key.cpp -Key.h diff --git a/cpp/test/Slice/keyword/Makefile b/cpp/test/Slice/keyword/Makefile deleted file mode 100644 index 847e5d97734..00000000000 --- a/cpp/test/Slice/keyword/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Key.o - -OBJS = $(SLICE_OBJS) \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPFLAGS := --underscore $(SLICE2CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(LIBS)) diff --git a/cpp/test/Slice/keyword/Makefile.mk b/cpp/test/Slice/keyword/Makefile.mk new file mode 100644 index 00000000000..64a291c284b --- /dev/null +++ b/cpp/test/Slice/keyword/Makefile.mk @@ -0,0 +1,13 @@ +# ********************************************************************** +# +# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# +# This copy of Ice is licensed to you under the terms described in the +# ICE_LICENSE file included in this distribution. +# +# ********************************************************************** + +$(test)_sliceflags = --underscore +$(test)_client_sources = Client.cpp Key.ice + +tests += $(test)
\ No newline at end of file diff --git a/cpp/test/Slice/macros/.gitignore b/cpp/test/Slice/macros/.gitignore deleted file mode 100644 index dcdf5eb23c7..00000000000 --- a/cpp/test/Slice/macros/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Test.h diff --git a/cpp/test/Slice/macros/Makefile b/cpp/test/Slice/macros/Makefile deleted file mode 100644 index 60511ee1ad2..00000000000 --- a/cpp/test/Slice/macros/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o - -OBJS = $(SLICE_OBJS) \ - Client.o - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(LIBS)) diff --git a/cpp/test/Slice/parser/.gitignore b/cpp/test/Slice/parser/.gitignore deleted file mode 100644 index 9fb83203e46..00000000000 --- a/cpp/test/Slice/parser/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -CircularA.o -CircularB.o -.depend -CircularA.cpp -CircularB.cpp -CircularA.h -CircularB.h diff --git a/cpp/test/Slice/parser/Makefile b/cpp/test/Slice/parser/Makefile deleted file mode 100644 index 9bc145bd3fa..00000000000 --- a/cpp/test/Slice/parser/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -TARGETS = $(OBJS) - -SLICE_OBJS = CircularA.ice \ - CircularB.ice - -OBJS = CircularA.o \ - CircularB.o - -SLICE_OBJS = $(OBJS) - -include $(top_srcdir)/config/Make.rules - -SLICE2CPPFLAGS := -I. $(SLICE2CPPFLAGS) -CPPFLAGS := -I. $(CPPFLAGS) diff --git a/cpp/test/Slice/structure/.gitignore b/cpp/test/Slice/structure/.gitignore deleted file mode 100644 index c837849dc6b..00000000000 --- a/cpp/test/Slice/structure/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -.depend -client -.depend -Test.cpp -Forward.cpp -Test.h -Forward.h diff --git a/cpp/test/Slice/structure/Makefile b/cpp/test/Slice/structure/Makefile deleted file mode 100644 index 53397a2db76..00000000000 --- a/cpp/test/Slice/structure/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -top_srcdir = ../../.. - -CLIENT = $(call mktestname,client) - -TARGETS = $(CLIENT) - -SLICE_OBJS = Test.o \ - Forward.o - -OBJS = Client.o \ - $(SLICE_OBJS) - -include $(top_srcdir)/config/Make.rules - -CPPFLAGS := -I. -I../../include $(CPPFLAGS) - -$(CLIENT): $(OBJS) - rm -f $@ - $(call mktest,$@,$(OBJS),$(LIBS)) diff --git a/cpp/test/Slice/utf8BOM/.gitignore b/cpp/test/Slice/utf8BOM/.gitignore deleted file mode 100644 index 446425aa735..00000000000 --- a/cpp/test/Slice/utf8BOM/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Test.o -.depend -Test.cpp -Test.h diff --git a/cpp/test/include/.gitignore b/cpp/test/include/.gitignore deleted file mode 100644 index 05cdd03c294..00000000000 --- a/cpp/test/include/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -// Generated by makegitignore.py - -// IMPORTANT: Do not edit this file -- any edits made here will be lost! -Controller.h |