diff options
| author | Kyungwook Tak <k.tak@samsung.com> | 2016-12-21 13:23:09 +0900 |
|---|---|---|
| committer | Kyungwook Tak <k.tak@samsung.com> | 2016-12-21 13:29:17 +0900 |
| commit | 2b8bdacbd59acd2abce0ff2c1e4114c526bd607b (patch) | |
| tree | a97d821629a037fcf3e03dc173ddd16558340d1c | |
| parent | 500a1b2473cb5d3c81235a5b87a45e92013b3545 (diff) | |
| download | csr-framework-2b8bdacbd59acd2abce0ff2c1e4114c526bd607b.tar.gz csr-framework-2b8bdacbd59acd2abce0ff2c1e4114c526bd607b.tar.bz2 csr-framework-2b8bdacbd59acd2abce0ff2c1e4114c526bd607b.zip | |
Don't throw exception in dtor
Change-Id: I52b7dfbe177b3c67bcc4529d9871736dfd9492db
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>
| -rw-r--r-- | test/internals/test-main.cpp | 11 | ||||
| -rw-r--r-- | test/test-common.h | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/test/internals/test-main.cpp b/test/internals/test-main.cpp index 9ba5318..c9c16b3 100644 --- a/test/internals/test-main.cpp +++ b/test/internals/test-main.cpp @@ -68,15 +68,8 @@ struct Initializer { if (!isEngineInitialized) return; - int ret = csre_cs_global_deinitialize(); - - if (ret != CSRE_ERROR_NONE) - throw std::logic_error("Failed to deinit content screening engine."); - - ret = csre_wp_global_deinitialize(); - - if (ret != CSRE_ERROR_NONE) - throw std::logic_error("Failed to deinit web protection engine."); + csre_cs_global_deinitialize(); + csre_wp_global_deinitialize(); BOOST_MESSAGE("Deinitialize engines"); } diff --git a/test/test-common.h b/test/test-common.h index 7ea1c01..cdec29a 100644 --- a/test/test-common.h +++ b/test/test-common.h @@ -223,9 +223,7 @@ public: ~ScopedChDir() { - if (::chdir(cdbuf) == -1) - throw std::system_error(errno, std::system_category(), - std::string(cdbuf) + " chdir failed"); + ::chdir(cdbuf); } private: |