diff options
Diffstat (limited to 'src/actions/make/tests/make_config_tests.cpp')
| -rw-r--r-- | src/actions/make/tests/make_config_tests.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/actions/make/tests/make_config_tests.cpp b/src/actions/make/tests/make_config_tests.cpp index 8c7c424..cfe49a9 100644 --- a/src/actions/make/tests/make_config_tests.cpp +++ b/src/actions/make/tests/make_config_tests.cpp @@ -8,7 +8,7 @@ #include "actions/tests/action_tests.h" extern "C" { #include "actions/make/make_project.h" -#include "platform/platform.h" +#include "base/env.h" } SUITE(action) @@ -19,7 +19,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeCppFlags_Defaults) { - make_project_config_cppflags(sess, prj, strm); + make_project_config_cppflags(prj, strm); CHECK_EQUAL( " CPPFLAGS += -MMD\n", buffer); @@ -29,7 +29,7 @@ SUITE(action) { char* defines[] = { "DEFINE0", "DEFINE1", NULL}; SetConfigField(prj, BlockDefines, defines); - make_project_config_cppflags(sess, prj, strm); + make_project_config_cppflags(prj, strm); CHECK_EQUAL( " CPPFLAGS += -MMD -D \"DEFINE0\" -D \"DEFINE1\"\n", buffer); @@ -42,7 +42,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_CFlags) { - make_project_config_cflags(sess, prj, strm); + make_project_config_cflags(prj, strm); CHECK_EQUAL( " CFLAGS += $(CPPFLAGS) $(ARCHFLAGS)\n", buffer); @@ -55,7 +55,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_CxxFlags) { - make_project_config_cxxflags(sess, prj, strm); + make_project_config_cxxflags(prj, strm); CHECK_EQUAL( " CXXFLAGS += $(CFLAGS)\n", buffer); @@ -68,7 +68,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_LdDeps) { - make_project_config_lddeps(sess, prj, strm); + make_project_config_lddeps(prj, strm); CHECK_EQUAL( " LDDEPS :=\n", buffer); @@ -81,7 +81,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_LdFlags) { - make_project_config_ldflags(sess, prj, strm); + make_project_config_ldflags(prj, strm); CHECK_EQUAL( " LDFLAGS +=\n", buffer); @@ -94,7 +94,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_ObjDir) { - make_project_config_objdir(sess, prj, strm); + make_project_config_objdir(prj, strm); CHECK_EQUAL( " OBJDIR := obj/Debug\\ DLL\n", buffer); @@ -107,8 +107,8 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_OutFile) { - platform_set(MacOSX); - make_project_config_outfile(sess, prj, strm); + env_set_os(MacOSX); + make_project_config_outfile(prj, strm); CHECK_EQUAL( " OUTFILE := $(OUTDIR)/My\\ Project\n", buffer); @@ -121,7 +121,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_OutDir) { - make_project_config_outdir(sess, prj, strm); + make_project_config_outdir(prj, strm); CHECK_EQUAL( " OUTDIR := .\n", buffer); @@ -134,7 +134,7 @@ SUITE(action) TEST_FIXTURE(FxAction, MakeProject_Config_ResFlags) { - make_project_config_resflags(sess, prj, strm); + make_project_config_resflags(prj, strm); CHECK_EQUAL( " RESFLAGS +=\n", buffer); |