From 65e690a087e1f946c54d660886d63d13b0865ade Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 25 Jan 2023 11:27:52 +0100 Subject: [PATCH] Revert "Add `rapidcheck` dependency for testing" This reverts commit c92e51ecec88dcb1e3485e50431bd66099b67c7f. --- configure.ac | 6 ------ doc/manual/src/contributing/hacking.md | 3 +-- flake.nix | 5 +---- src/libstore/tests/local.mk | 2 +- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 0066bc389..1b0d6fd27 100644 --- a/configure.ac +++ b/configure.ac @@ -274,12 +274,6 @@ fi PKG_CHECK_MODULES([GTEST], [gtest_main]) -# Look for rapidcheck. -# No pkg-config yet, https://github.com/emil-e/rapidcheck/issues/302 -AC_CHECK_HEADERS([rapidcheck/gtest.h], [], [], [#include ]) -AC_CHECK_LIB([rapidcheck], []) - - # Look for nlohmann/json. PKG_CHECK_MODULES([NLOHMANN_JSON], [nlohmann_json >= 3.9]) diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md index 9dbafcc0a..aeb0d41b3 100644 --- a/doc/manual/src/contributing/hacking.md +++ b/doc/manual/src/contributing/hacking.md @@ -92,8 +92,7 @@ $ nix develop The unit-tests for each Nix library (`libexpr`, `libstore`, etc..) are defined under `src/{library_name}/tests` using the -[googletest](https://google.github.io/googletest/) and -[rapidcheck](https://github.com/emil-e/rapidcheck) frameworks. +[googletest](https://google.github.io/googletest/) framework. You can run the whole testsuite with `make check`, or the tests for a specific component with `make libfoo-tests_RUN`. Finer-grained filtering is also possible using the [--gtest_filter](https://google.github.io/googletest/advanced.html#running-a-subset-of-the-tests) command-line option. diff --git a/flake.nix b/flake.nix index 549ded43d..ce80fbd56 100644 --- a/flake.nix +++ b/flake.nix @@ -82,9 +82,7 @@ }); configureFlags = - [ - "CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include" - ] ++ lib.optionals stdenv.isLinux [ + lib.optionals stdenv.isLinux [ "--with-boost=${boost}/lib" "--with-sandbox-shell=${sh}/bin/busybox" ] @@ -118,7 +116,6 @@ boost lowdown-nix gtest - rapidcheck ] ++ lib.optionals stdenv.isLinux [libseccomp] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium diff --git a/src/libstore/tests/local.mk b/src/libstore/tests/local.mk index a2cf8a0cf..f74295d97 100644 --- a/src/libstore/tests/local.mk +++ b/src/libstore/tests/local.mk @@ -12,4 +12,4 @@ libstore-tests_CXXFLAGS += -I src/libstore -I src/libutil libstore-tests_LIBS = libstore libutil -libstore-tests_LDFLAGS := -lrapidcheck $(GTEST_LIBS) +libstore-tests_LDFLAGS := $(GTEST_LIBS)