diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-02 14:06:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-02 14:06:34 +0000 |
| commit | e98d09d0ad16a6bd843f0b691d39dd0bac4ff357 (patch) | |
| tree | cc980cc0f1818bf31f01da4449e3a8d5459fa7c8 /smoketestoo_native | |
| parent | b50f9fc50ba1e6b276ade74df612a81eba5e8bc8 (diff) | |
make smoketest use ooinstal to build its install set
Diffstat (limited to 'smoketestoo_native')
| -rw-r--r-- | smoketestoo_native/makefile.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index a05065d546e9..75ebd95cc2cc 100644 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -59,14 +59,9 @@ cpptest : $(SHL1TARGETN) OOO_CPPTEST_ARGS = $(SHL1TARGETN) -env:arg-doc=$(BIN)/smoketestdoc.sxw .IF "$(OS)" != "WNT" -$(installationtest_instpath).flag : $(shell ls \ - $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).tar.gz) +localinstall : $(RM) -r $(installationtest_instpath) $(MKDIRHIER) $(installationtest_instpath) - cd $(installationtest_instpath) && $(GNUTAR) xfz \ - $(installationtest_instset)/LibO_*_install-arc_$(defaultlangiso).tar.gz - $(MV) $(installationtest_instpath)/LibO_*_install-arc_$(defaultlangiso) \ - $(installationtest_instpath)/opt - $(TOUCH) $@ -cpptest : $(installationtest_instpath).flag + ooinstall $(installationtest_instpath)/opt +cpptest : localinstall .END |