From 36f531685c8036f5dc39a19f0a0252a951879211 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 29 Dec 2023 23:18:07 +0100 Subject: [PATCH] Fixed a test fail when private test data is not available --- src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc | 2 ++ src/tl/tl/tlUnitTest.cc | 1 + 2 files changed, 3 insertions(+) diff --git a/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc b/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc index 3ef9f1dfe..9ecbf3937 100644 --- a/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc +++ b/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc @@ -595,6 +595,8 @@ TEST(Bug_1474) db::OASISReader reader (file); reader.read (layout); EXPECT_EQ (false, true); + } catch (tl::CancelException &ex) { + // Seen when private test data is not installed } catch (tl::Exception &ex) { EXPECT_EQ (ex.msg (), "Cell named ADDHX2 with ID 4 was already given name SEDFFTRX2 (position=763169, cell=)"); } diff --git a/src/tl/tl/tlUnitTest.cc b/src/tl/tl/tlUnitTest.cc index f6f1ef3d3..40497ecc8 100644 --- a/src/tl/tl/tlUnitTest.cc +++ b/src/tl/tl/tlUnitTest.cc @@ -104,6 +104,7 @@ std::string testdata_private () std::string pp = tl::combine_path (tl::testsrc (), "private"); pp = tl::combine_path (pp, "testdata"); if (! tl::file_exists (pp)) { + tl::warn << "Cancelling test as private test data is not available."; throw tl::CancelException (); } return pp;