diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:06:47 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:06:47 +0000 |
| commit | 9439e16a2c87ab89462e62a7497d2d9ac28a33e0 (patch) | |
| tree | ae3e43e76290e0fb45a6050e3b221afe73b0009a | |
| parent | 499e6bbd8fc7fc4f67c417f768b1f66afaa96f77 (diff) | |
INTEGRATION: CWS sb83 (1.6.218); FILE MERGED
2007/12/18 11:47:16 sb 1.6.218.1: #i84200# On Linux, start testshl2 with full path, so that osl_getModuleURLFromAddress for symbol main returns the correct path of the executable.
| -rw-r--r-- | solenv/inc/_cppunit.mk | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk index c8ea5b95ee04..7aab2b0cdb13 100644 --- a/solenv/inc/_cppunit.mk +++ b/solenv/inc/_cppunit.mk @@ -20,8 +20,12 @@ test1: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#1 on library $(TEST1LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST1LIB) $(TEST1OPT) +.ELSE testshl2 $(TEST1LIB) $(TEST1OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -45,8 +49,12 @@ test2: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#2 on library $(TEST2LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST2LIB) $(TEST2OPT) +.ELSE testshl2 $(TEST2LIB) $(TEST2OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -70,8 +78,12 @@ test3: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#3 on library $(TEST3LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST3LIB) $(TEST3OPT) +.ELSE testshl2 $(TEST3LIB) $(TEST3OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -95,8 +107,12 @@ test4: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#4 on library $(TEST4LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST4LIB) $(TEST4OPT) +.ELSE testshl2 $(TEST4LIB) $(TEST4OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -120,8 +136,12 @@ test5: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#5 on library $(TEST5LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST5LIB) $(TEST5OPT) +.ELSE testshl2 $(TEST5LIB) $(TEST5OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -145,8 +165,12 @@ test6: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#6 on library $(TEST6LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST6LIB) $(TEST6OPT) +.ELSE testshl2 $(TEST6LIB) $(TEST6OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -170,8 +194,12 @@ test7: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#7 on library $(TEST7LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST7LIB) $(TEST7OPT) +.ELSE testshl2 $(TEST7LIB) $(TEST7OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -195,8 +223,12 @@ test8: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#8 on library $(TEST8LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST8LIB) $(TEST8OPT) +.ELSE testshl2 $(TEST8LIB) $(TEST8OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -220,8 +252,12 @@ test9: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#9 on library $(TEST9LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST9LIB) $(TEST9OPT) +.ELSE testshl2 $(TEST9LIB) $(TEST9OPT) .ENDIF +.ENDIF # unroll begin # ---- create the test libraries ------------------------------------ @@ -245,6 +281,10 @@ test10: ALLTAR @echo ---------------------------------------------------------- @echo - start unit test \#10 on library $(TEST10LIB) @echo ---------------------------------------------------------- +.IF "$(OS)" == "LINUX" # full path needed by osl_getModuleURLFromAddress: + `which testshl2` $(TEST10LIB) $(TEST10OPT) +.ELSE testshl2 $(TEST10LIB) $(TEST10OPT) .ENDIF +.ENDIF |