From dc4b2b20565a58f09c761b9affd6abdc7edb705b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 25 Feb 2011 12:34:07 +0200 Subject: Add support for tests in subdirectories --- tracer/makefile | 2 +- tracer/object/makefile | 2 +- tracer/pragma/makefile | 2 +- tracer/template/makefile | 2 +- tracer/template/template-vc10.vcxproj | 10 +++++----- tracer/template/template-vc9.vcproj | 10 +++++----- tracer/transaction/makefile | 2 +- tracer/types/makefile | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tracer') diff --git a/tracer/makefile b/tracer/makefile index a549440..e566c59 100644 --- a/tracer/makefile +++ b/tracer/makefile @@ -20,7 +20,7 @@ clean := $(out_base)/.clean $(default): $(addprefix $(out_base)/,$(addsuffix /,$(tests))) -$(dist): name := $(notdir $(src_base)) +$(dist): name := tracer $(dist): export dirs := $(filter-out include,$(tests)) $(dist): export extra_dist := $(name)-vc9.sln $(name)-vc10.sln test.bat $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(tests))) diff --git a/tracer/object/makefile b/tracer/object/makefile index 428743d..9c4ef1f 100644 --- a/tracer/object/makefile +++ b/tracer/object/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/pragma/makefile b/tracer/pragma/makefile index caf5cd4..5ae74ef 100644 --- a/tracer/pragma/makefile +++ b/tracer/pragma/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/template/makefile b/tracer/template/makefile index 0e5c780..ce99eb2 100644 --- a/tracer/template/makefile +++ b/tracer/template/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/template/template-vc10.vcxproj b/tracer/template/template-vc10.vcxproj index d2e5ae0..523fb79 100644 --- a/tracer/template/template-vc10.vcxproj +++ b/tracer/template/template-vc10.vcxproj @@ -89,7 +89,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\libcommon + $(SolutionDir)\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) @@ -105,7 +105,7 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\libcommon + $(SolutionDir)\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) @@ -123,7 +123,7 @@ true true WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\libcommon + $(SolutionDir)\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) @@ -143,7 +143,7 @@ true true WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H;%(PreprocessorDefinitions) - ..\..\libcommon + $(SolutionDir)\..\libcommon 4068;4355;4800;4290;%(DisableSpecificWarnings) @@ -160,7 +160,7 @@ m4_dnl __custom_build_entry__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) ) diff --git a/tracer/template/template-vc9.vcproj b/tracer/template/template-vc9.vcproj index 73649a4..da08589 100644 --- a/tracer/template/template-vc9.vcproj +++ b/tracer/template/template-vc9.vcproj @@ -45,7 +45,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -122,7 +122,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -199,7 +199,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="0" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_VC_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -277,7 +277,7 @@ AdditionalOptions="/wd4068 /wd4355 /wd4800 /wd4290" Optimization="2" EnableIntrinsicFunctions="true" - AdditionalIncludeDirectories="..\..\libcommon" + AdditionalIncludeDirectories="$(SolutionDir)\..\libcommon" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_VC_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -349,7 +349,7 @@ m4_ifelse(__value__(odb_options),,, __file_entry_custom_build__( test.hxx, odb test.hxx, -odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I..\..\libcommon)) test.hxx, +odb.exe __xml__(__shell_quotes__(__value__(odb_options) -DHAVE_CONFIG_VC_H -I$(SolutionDir)\..\libcommon)) test.hxx, test-odb.hxx;test-odb.ixx;test-odb.cxx) __file_entry__(test-odb.hxx) __file_entry__(test-odb.ixx)) diff --git a/tracer/transaction/makefile b/tracer/transaction/makefile index 98d24b7..3979cf3 100644 --- a/tracer/transaction/makefile +++ b/tracer/transaction/makefile @@ -40,7 +40,7 @@ $(out_base)/: $(driver) # $(dist): sources := $(cxx_tun) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): diff --git a/tracer/types/makefile b/tracer/types/makefile index c2da4c8..ee24b4d 100644 --- a/tracer/types/makefile +++ b/tracer/types/makefile @@ -55,7 +55,7 @@ $(out_base)/: $(driver) $(dist): sources := $(cxx_tun) $(dist): headers := $(odb_hdr) $(dist): data_dist := test.std -$(dist): export name := $(notdir $(src_base)) +$(dist): export name := $(subst /,-,$(subst $(src_root)/tracer/,,$(src_base))) $(dist): export extra_dist := $(data_dist) $(name)-vc9.vcproj \ $(name)-vc10.vcxproj $(name)-vc10.vcxproj.filters $(dist): -- cgit v1.1