diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-09-28 15:57:53 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-09-28 17:55:26 +0100 |
| commit | 5e4451575964151dbe7b0e905d0a9f4757f609d2 (patch) | |
| tree | 143fc6747034266118c2e5687abc73e3efcc6133 /unotest/source | |
| parent | d0edcf0a554828232ab3c8edfbea22d611bfda2b (diff) | |
Rename and re-factor test and unotest to compile and run again
Diffstat (limited to 'unotest/source')
| -rw-r--r-- | unotest/source/cpp/gettestargument.cxx | 2 | ||||
| -rw-r--r-- | unotest/source/cpp/makefile.mk | 8 | ||||
| -rw-r--r-- | unotest/source/cpp/officeconnection.cxx | 6 | ||||
| -rw-r--r-- | unotest/source/cpp/toabsolutefileurl.cxx | 2 | ||||
| -rw-r--r-- | unotest/source/cpp/uniquepipename.cxx | 2 | ||||
| -rw-r--r-- | unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx | 1 |
6 files changed, 7 insertions, 14 deletions
diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx index 0bc00062e8d3..24e5c57feeff 100644 --- a/unotest/source/cpp/gettestargument.cxx +++ b/unotest/source/cpp/gettestargument.cxx @@ -30,7 +30,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" -#include "test/gettestargument.hxx" +#include "unotest/gettestargument.hxx" #include "getargument.hxx" diff --git a/unotest/source/cpp/makefile.mk b/unotest/source/cpp/makefile.mk index 31eafda84da9..b28b1edb2b22 100644 --- a/unotest/source/cpp/makefile.mk +++ b/unotest/source/cpp/makefile.mk @@ -40,7 +40,6 @@ CFLAGSCXX += $(CPPUNIT_CFLAGS) SLOFILES = \ $(SLO)/getargument.obj \ $(SLO)/gettestargument.obj \ - $(SLO)/bootstrapfixture.obj \ $(SLO)/officeconnection.obj \ $(SLO)/toabsolutefileurl.obj \ $(SLO)/uniquepipename.obj @@ -53,16 +52,11 @@ SHL1IMPLIB = i$(SHL1TARGET) SHL1OBJS = $(SLOFILES) SHL1RPATH = NONE SHL1STDLIBS = \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ $(CPPULIB) \ $(CPPUNITLIB) \ $(SALLIB) -SHL1TARGET = test +SHL1TARGET = unotest SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx index 9c8d4d549b71..1b2e47c36b15 100644 --- a/unotest/source/cpp/officeconnection.cxx +++ b/unotest/source/cpp/officeconnection.cxx @@ -40,9 +40,9 @@ #include "osl/time.h" #include "sal/macros.h" #include "sal/types.h" -#include "test/officeconnection.hxx" -#include "test/toabsolutefileurl.hxx" -#include "test/uniquepipename.hxx" +#include "unotest/officeconnection.hxx" +#include "unotest/toabsolutefileurl.hxx" +#include "unotest/uniquepipename.hxx" #include "getargument.hxx" diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx index e7c97d2fb85f..ec9749174215 100644 --- a/unotest/source/cpp/toabsolutefileurl.cxx +++ b/unotest/source/cpp/toabsolutefileurl.cxx @@ -32,7 +32,7 @@ #include "osl/file.hxx" #include "osl/process.h" #include "rtl/ustring.hxx" -#include "test/toabsolutefileurl.hxx" +#include "unotest/toabsolutefileurl.hxx" namespace { diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx index 1725ca218918..eae8de322f0d 100644 --- a/unotest/source/cpp/uniquepipename.cxx +++ b/unotest/source/cpp/uniquepipename.cxx @@ -34,7 +34,7 @@ #include "rtl/ustring.h" #include "rtl/ustring.hxx" #include "sal/types.h" -#include "test/uniquepipename.hxx" +#include "unotest/uniquepipename.hxx" namespace test { diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx index 7e7e0000c49a..3829bd1b3b6e 100644 --- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx +++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx @@ -24,7 +24,6 @@ * for a copy of the LGPLv3 License. ************************************************************************/ -#include "precompiled_test.hxx" #include "sal/config.h" #include "sal/precppunit.hxx" |