summaryrefslogtreecommitdiff
path: root/solenv/inc/cppunit.mk
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-03-18 12:07:55 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-03-18 12:07:55 +0000
commit97dd0b9380fbd431722ed2577726c0ec15edf069 (patch)
tree1d10976e488a499fd621abc83582b2ec89a10183 /solenv/inc/cppunit.mk
parentad76315ef352902bd61c07a4ac3e9dced47f9594 (diff)
INTEGRATION: CWS sb83 (1.7.218); FILE MERGED
2007/12/18 11:47:16 sb 1.7.218.1: #i84200# On Linux, start testshl2 with full path, so that osl_getModuleURLFromAddress for symbol main returns the correct path of the executable.
Diffstat (limited to 'solenv/inc/cppunit.mk')
-rw-r--r--solenv/inc/cppunit.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 22ecc6eb7803..f8caa760f697 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: cppunit.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: ihi $ $Date: 2007-06-04 13:19:10 $
+# last change: $Author: vg $ $Date: 2008-03-18 13:07:55 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -78,7 +78,11 @@ test$(TNR): ALLTAR
@echo ----------------------------------------------------------
@echo - start unit test \#$(TNR) on library $(TEST$(TNR)LIB)
@echo ----------------------------------------------------------
+.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress:
+ `which testshl2` $(TEST$(TNR)LIB) $(TEST$(TNR)OPT)
+.ELSE
testshl2 $(TEST$(TNR)LIB) $(TEST$(TNR)OPT)
.ENDIF
+.ENDIF
# unroll end