diff options
Diffstat (limited to 'smoketestoo_native')
| -rwxr-xr-x | smoketestoo_native/makefile.mk | 15 | ||||
| -rwxr-xr-x | smoketestoo_native/smoketest.cxx | 7 |
2 files changed, 10 insertions, 12 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index aab245371a72..195ef4052645 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -62,14 +62,9 @@ TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(UPDMINOREXT)/smoketestdoc.sxw CPPTEST_LIBRARY = $(SHL1TARGETN) .IF "$(OS)" != "WNT" -$(installationtest_instpath).flag : $(shell ls \ - $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz) - $(COMMAND_ECHO)$(RM) -r $(installationtest_instpath) - $(COMMAND_ECHO)$(MKDIRHIER) $(installationtest_instpath) - $(COMMAND_ECHO)cd $(installationtest_instpath) && $(GNUTAR) xfz \ - $(installationtest_instset)/OOo_*_install-arc_$(defaultlangiso).tar.gz - $(COMMAND_ECHO)$(MV) $(installationtest_instpath)/OOo_*_install-arc_$(defaultlangiso) \ - $(installationtest_instpath)/opt - $(COMMAND_ECHO)$(TOUCH) $@ -cpptest : $(installationtest_instpath).flag +localinstall : + $(RM) -r $(installationtest_instpath) + $(MKDIRHIER) $(installationtest_instpath) + ooinstall $(installationtest_instpath)/opt +cpptest : localinstall .END diff --git a/smoketestoo_native/smoketest.cxx b/smoketestoo_native/smoketest.cxx index 5fd16914b0d7..76acb326c429 100755 --- a/smoketestoo_native/smoketest.cxx +++ b/smoketestoo_native/smoketest.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,13 +48,13 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/Sequence.hxx" #include "com/sun/star/util/URL.hpp" -#include <preextstl.h> + #include "cppuhelper/implbase1.hxx" #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" #include "cppunit/extensions/HelperMacros.h" #include "cppunit/plugin/TestPlugIn.h" -#include <postextstl.h> + #include "osl/conditn.hxx" #include "osl/diagnose.h" #include "rtl/ustring.h" @@ -207,3 +208,5 @@ CPPUNIT_TEST_SUITE_REGISTRATION(Test); } CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |