summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-01-23 11:27:38 +0000
committerOliver Bolte <obo@openoffice.org>2007-01-23 11:27:38 +0000
commit1b01ad9adbc4a564d6a6101e26838df829b3d78f (patch)
tree509c4e0d6f9ce111e455feadf506e5f806ece199 /shell
parenta767f73f878ff0e55d8a99ead1bbdfb8492ccb53 (diff)
INTEGRATION: CWS obr04 (1.9.70); FILE MERGED
2007/01/11 09:42:38 obr 1.9.70.2: #i72543# compile fixes + bug in test app 2007/01/10 15:02:15 obr 1.9.70.1: #i72543# correctly encode what gets passed to the shell via popen + add unit test
Diffstat (limited to 'shell')
-rw-r--r--shell/source/unix/exec/makefile.mk24
1 files changed, 22 insertions, 2 deletions
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 23822260078c..b598e5f7fc5a 100644
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
-# last change: $Author: vg $ $Date: 2006-05-24 14:04:52 $
+# last change: $Author: obo $ $Date: 2007-01-23 12:27:38 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -42,6 +42,8 @@ ENABLE_EXCEPTIONS=TRUE
COMP1TYPELIST=syssh
+TESTAPP1=urltest
+
# --- Settings -----------------------------------------------------
.INCLUDE : settings.mk
@@ -68,7 +70,25 @@ SHL1STDLIBS=$(CPPULIB)\
SHL1LIBS=
SHL1DEPN=
+.IF "$(test)" != ""
+
+APP1TARGET=$(TESTAPP1)
+APP1STDLIBS= $(SHL1STDLIBS)
+APP1OBJS= \
+ $(SLO)$/shellexec.obj \
+ $(SLO)$/$(APP1TARGET).obj
+
+.ENDIF # "$(test)" != ""
+
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
+run_test : $(BIN)$/$(TESTAPP1).sh
+ dmake test=t
+ $(BIN)$/$(TESTAPP1) urltest.txt
+
+$(BIN)$/$(TESTAPP1).sh : $$(@:f)
+ $(COPY) $< $@
+ -chmod +x $@