diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-03 10:00:55 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-03 10:00:55 +0300 |
commit | 335cd830b0bd430d282687df58a91a69dac2c528 (patch) | |
tree | 3d49d43ed0c07d643b9fd081e6eb0522b57851c2 /sal/qa/osl/process/osl_process.cxx | |
parent | c04f4393f5ec63dbd546b5c503ddc82d9cd2377e (diff) |
Kill superfluous vertical whitespace
Change-Id: I8c37b9ec45836f9c0e2dc0cf232f96f23c7c36d3
Diffstat (limited to 'sal/qa/osl/process/osl_process.cxx')
-rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index e4d2028fb55e..db6d19c382ff 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,6 @@ const rtl::OUString EXECUTABLE_NAME ("osl_process_child"); #endif - using namespace osl; using ::rtl::OUString; @@ -102,7 +101,6 @@ inline ::rtl::OUString getExecutablePath( void ) //rtl::OUString CWD = getExecutablePath(); - class Test_osl_joinProcess : public CppUnit::TestFixture { const OUString join_param_; @@ -308,13 +306,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; - - typedef std::vector<std::string, rtl::Allocator<std::string> > string_container_t; typedef string_container_t::const_iterator string_container_const_iter_t; typedef string_container_t::iterator string_container_iter_t; - class exclude : public std::unary_function<std::string, bool> { public: @@ -327,7 +322,6 @@ public: exclude_list_.push_back(env_var_name(*iter)); } - bool operator() (const std::string& env_var) const { return (exclude_list_.end() != @@ -405,7 +399,6 @@ namespace } #endif - class Test_osl_executeProcess : public CppUnit::TestFixture { const OUString env_param_; @@ -419,7 +412,6 @@ class Test_osl_executeProcess : public CppUnit::TestFixture public: - // ctor Test_osl_executeProcess() : env_param_(OUString("-env")), @@ -432,7 +424,6 @@ public: suExecutableFileURL += EXECUTABLE_NAME; } - virtual void setUp() SAL_OVERRIDE { temp_file_path_ = create_temp_file(temp_file_url_); @@ -444,7 +435,6 @@ public: osl::File::remove(temp_file_url_); } - OUString create_temp_file(OUString &temp_file_url) { FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url); @@ -457,7 +447,6 @@ public: return temp_file_path; } - void read_child_environment(string_container_t* env_container) { OString temp_file_name = OUStringToOString(OUString( @@ -477,7 +466,6 @@ public: tidy_container(*env_container); } - // environment of the child process that was // started. The child process writes his // environment into a file @@ -493,7 +481,6 @@ public: (std::equal(child_env.begin(), child_env.end(), parent_env.begin()))); } - // compare the equal environment parts and the // different part of the child environment bool compare_merged_environments(const string_container_t& different_env_vars) @@ -549,7 +536,6 @@ public: std::cerr << "different should be: " << *iter << std::endl; #endif - #if OSL_DEBUG_LEVEL > 1 for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter) std::cerr << "different are: " << *iter << std::endl; @@ -563,7 +549,6 @@ public: different_env_size_equals && different_env_content_equals); } - // test that parent and child process have the // same environment when osl_executeProcess will // be called with out setting new environment @@ -605,7 +590,6 @@ public: ); } - #define ENV1 "PAT=a:\\" #define ENV2 "PATHb=b:\\" #define ENV3 "Patha=c:\\" @@ -748,7 +732,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - // register test suites //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_joinProcess, "Test_osl_joinProcess"); CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess); |