diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-21 18:51:16 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-01-21 19:33:13 +0100 |
| commit | 67cf29bb36587f03ec19c789657da4236553c5fd (patch) | |
| tree | cec5aa765c85e599092ff1954b3e2aed19ea9a65 /sal/qa | |
| parent | 68dad6ff9d5547d94ff1b1085dfec9c8fef9c726 (diff) | |
sal: make more tests running
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/osl/module/osl_Module.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 09dc1d0bdea8..c460acbbdc14 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -66,9 +66,9 @@ inline void printUString( const ::rtl::OUString & str ) inline ::rtl::OUString getDllURL( void ) { #if ( defined WNT ) // lib in Unix and lib in Windows are not same in file name. - ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("Module_DLL.dll") ); + ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("test_Module_DLL.dll") ); #else - ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libModule_DLL.so") ); + ::rtl::OUString libPath( RTL_CONSTASCII_USTRINGPARAM("libtest_Module_DLL.so") ); #endif ::rtl::OUString dirPath, dllPath; diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index c8a79a81462f..367d6d94aa23 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -106,7 +106,7 @@ inline ::rtl::OUString getExecutablePath( void ) osl::Module::getUrlFromAddress( ( void* ) &getExecutablePath, dirPath ); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') ); dirPath = dirPath.copy( 0, dirPath.lastIndexOf('/') + 1); - dirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("bin")); + dirPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Executable")); return dirPath; } @@ -744,8 +744,7 @@ public: CPPUNIT_TEST(osl_execProc_parent_equals_child_environment); CPPUNIT_TEST(osl_execProc_merged_child_environment); #endif - ///TODO: Repair makefile to get the batch.sh, batch.bat copied to $(BIN) for test execution - // CPPUNIT_TEST(osl_execProc_test_batch); + CPPUNIT_TEST(osl_execProc_test_batch); ///TODO: Repair test (or tested function ;-) - test fails. // CPPUNIT_TEST(osl_execProc_exe_name_in_argument_list); SAL_CPPUNIT_TEST_SUITE_END(); |