diff --git a/dev-libs/libmongocrypt/files/skip-tests.txt b/dev-libs/libmongocrypt/files/skip-tests.txt deleted file mode 100644 index 0e3df23..0000000 --- a/dev-libs/libmongocrypt/files/skip-tests.txt +++ /dev/null @@ -1,38 +0,0 @@ -# This file lists known failing or flaky tests that for some reason or another -# cannot be fixed and rather should be skipped in Evergreen builds. Note that -# listing a test in this file will result in the test being skipped on all -# platforms, build variants, tasks, etc. -# -# The format of this file is as follows: -# - one test per line, with an optional comment (total lines in file < 1,000) -# - comments begin with a hash (#) character and continue to the end of the line -# - lines starting with the comment character and blank lines are ignored -# - specify test names as they are known to the test runner (e.g., /some/test) -# - specify sub-tests of spec tests by an additional slash (/) and the quoted description -# (e.g., /some/spec/test/"sub-test 1") -# - placing a comment at the end of a line will cause the test runner to output -# the comment text as the skip reason when the test is skipped -# -# Example entries: -# /skip/entire/test # this will be output by the runner as the skip reason -# /skip/part/of/spec/test/"sub-test description" # this will also be output - -#/change_stream/live/track_resume_token # (CDRIVER-4344) Condition 'bson_compare (resume_token, &doc2_rt) == 0' failed -#/ClientPool/pop_timeout # (CDRIVER-4348) precondition failed: duration_usec / 1000 >= 1990 - -#/change_streams/legacy/change-streams # (CDRIVER-4350) Could not establish stream for node 127.0.0.1:8000: [TLS handshake failed: Connection timed out calling hello on '127.0.0.1:8000'] -#/change_streams/legacy/change-streams-resume-allowlist # (CDRIVER-4350) Could not establish stream for node 127.0.0.1:8000: [TLS handshake failed: Connection timed out calling hello on '127.0.0.1:8000'] -#/change_streams/legacy/change-streams-resume-errorLabels # (CDRIVER-4350) Could not establish stream for node 127.0.0.1:8000: [TLS handshake failed: Connection timed out calling hello on '127.0.0.1:8000'] -#/unified/entity-find-cursor # (CDRIVER-4350) Could not establish stream for node 127.0.0.1:8000: [TLS handshake failed: Connection timed out calling hello on '127.0.0.1:8000'] -#/change_streams/legacy/change-streams-errors # (CDRIVER-4350) Could not establish stream for node 127.0.0.1:8000: [TLS handshake failed: Connection timed out calling hello on '127.0.0.1:8000'] (on ASAN Tests Ubuntu 18.04 build variant) - -#/transactions/legacy/mongos-recovery-token/"commitTransaction retry fails on new mongos" # fails with server selection timeout (CDRIVER-4268) -#/transactions/legacy/pin-mongos/"unpin after transient error within a transaction and commit" # (CDRIVER-4351) server selection timeout (on ASAN Tests Ubuntu 18.04 build variant) -#/Samples # (CDRIVER-4352) strange "heartbeat failed" error - -#/client_side_encryption/bypass_spawning_mongocryptd/mongocryptdBypassSpawn # Fails if crypt_shared is visible - -/MongoDB/handshake/null_args #potentially gcc14 related - -/http/get # we dont run simplehttp on gentoo -/http/post # we dont run simplehttp on gentoo diff --git a/dev-libs/libmongocrypt/libmongocrypt-1.10.0.ebuild b/dev-libs/libmongocrypt/libmongocrypt-1.10.0.ebuild index 2bbd697..b770751 100644 --- a/dev-libs/libmongocrypt/libmongocrypt-1.10.0.ebuild +++ b/dev-libs/libmongocrypt/libmongocrypt-1.10.0.ebuild @@ -15,18 +15,12 @@ KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86" IUSE="static-libs test" REQUIRED_USE="test? ( static-libs )" -# No tests on x86 because tests require dev-db/mongodb which don't support -# x86 anymore (bug #645994) -RESTRICT="x86? ( test ) - !test? ( test )" - RDEPEND=" >=dev-libs/libbson-1.17.0[static-libs?] dev-libs/openssl:= " DEPEND="${RDEPEND} test? ( - dev-db/mongodb dev-libs/libbson[static-libs] )" @@ -34,22 +28,9 @@ DEPEND="${RDEPEND} # "${FILESDIR}/inteldfp.patch" #) -src_prepare() { - cmake_src_prepare - - # remove doc files -# sed -i '/^\s*install\s*(FILES COPYING NEWS/,/^\s*)/{d}' CMakeLists.txt || die - - # enable tests -# sed -i '/message (STATUS "disabling test-libmongoc since using system libbson")/{d}' CMakeLists.txt || die -# sed -i '/SET (ENABLE_TESTS OFF)/{d}' CMakeLists.txt || die -# sed -i 's/message (FATAL_ERROR "System libbson built without static library target")/message (STATUS "System libbson built without static library target")/' CMakeLists.txt || die -# sed -i 's##"bson/bson-private.h"#' src/libbson/tests/test-bson.c || die -} - src_configure() { local mycmakeargs=( - -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath + -DCMAKE_SKIP_RPATH=ON -DUSE_SHARED_LIBBSON=ON -DMONGOCRYPT_MONGOC_DIR=USE-SYSTEM -DENABLE_ONLINE_TESTS=OFF @@ -60,16 +41,3 @@ src_configure() { cmake_src_configure } - -# FEATURES="test -network-sandbox" USE="static-libs" emerge dev-libs/mongo-c-driver -#src_test() { -# local PORT=27099 -# mongod --setParameter enableTestCommands=1 --enableMajorityReadConcern \ -# --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \ -# --dbpath="${T}" --logpath="${T}/mongod.log" || die -# MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" \ -# MONGOC_ENABLE_MAJORITY_READ_CONCERN=on \ -# ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc \ -# --skip-tests "${FILESDIR}/skip-tests.txt" || die -# kill $(<"${T}/mongod.lock") -#} diff --git a/dev-libs/libmongocrypt/metadata.xml b/dev-libs/libmongocrypt/metadata.xml index 6969885..5e9e9af 100644 --- a/dev-libs/libmongocrypt/metadata.xml +++ b/dev-libs/libmongocrypt/metadata.xml @@ -6,6 +6,6 @@ Alexys Jacob - mongodb/mongo-c-driver + mongodb/libmongocrypt