diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 13:00:38 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-11 13:00:38 +0100 |
| commit | cc72dd1a32cf6acaba613fa6ea289a7bd89ef1d2 (patch) | |
| tree | 05700b2841b91a3e00de0df08db00e8cdc3742e1 | |
| parent | df399dd5b190c0e45262b6409fb7d7a08163abd9 (diff) | |
gnumake3: renamed TestFixture to CppunitTest
| -rwxr-xr-x | sfx2/CppunitTest_sfx2_metadatable.mk (renamed from sfx2/TestFixture_sfx2_metadatable.mk) | 8 | ||||
| -rwxr-xr-x | sfx2/JunitTest_sfx2_complex.mk | 7 | ||||
| -rwxr-xr-x | sfx2/Module_sfx2.mk | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/sfx2/TestFixture_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk index f41a25a16747..3516456832a6 100755 --- a/sfx2/TestFixture_sfx2_metadatable.mk +++ b/sfx2/CppunitTest_sfx2_metadatable.mk @@ -25,18 +25,18 @@ # #************************************************************************* -$(eval $(call gb_TestFixture_TestFixture,sfx2_metadatable)) +$(eval $(call gb_CppunitTest_CppunitTest,sfx2_metadatable)) -$(eval $(call gb_TestFixture_add_exception_objects,sfx2_metadatable, \ +$(eval $(call gb_CppunitTest_add_exception_objects,sfx2_metadatable, \ sfx2/qa/cppunit/test_metadatable \ )) -$(eval $(call gb_TestFixture_add_linked_libs,sfx2_metadatable, \ +$(eval $(call gb_CppunitTest_add_linked_libs,sfx2_metadatable, \ sal \ sfx \ )) -$(eval $(call gb_TestFixture_set_include,sfx2_metadatable,\ +$(eval $(call gb_CppunitTest_set_include,sfx2_metadatable,\ $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk index 9f7a6a8154e8..3513b63b06c8 100755 --- a/sfx2/JunitTest_sfx2_complex.mk +++ b/sfx2/JunitTest_sfx2_complex.mk @@ -31,13 +31,6 @@ $(eval $(call gb_JunitTest_set_defs,sfx2_complex,\ $$(DEFS) \ -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ )) -$(info $(call gb_JunitTest_set_defs,sfx2_complex,\ - -Dorg.openoffice.test.arg.soffice=path:$(OUTDIR)/installation/opt/openoffice.org3/program/soffice \ - -Dorg.openoffice.test.arg.env=LD_LIBRARY_PATH \ - -Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$*) \ - -Dorg.openoffice.test.arg.docpath=$(SRCDIR)/sfx2/qa/complex/framework/testdocuments \ - $$(DEFS) \ -)) $(eval $(call gb_JunitTest_add_sourcefiles,sfx2_complex,\ sfx2/qa/complex/framework/CheckGlobalEventBroadcaster_writer1 \ diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index 2dc117af1dff..06d3ae861a80 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\ )) $(eval $(call gb_Module_add_check_targets,sfx2,\ - TestFixture_sfx2_metadatable \ + CppunitTest_sfx2_metadatable \ )) $(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ |