From bc671fef83d94fbeddc810c5b968c18f7a75efd6 Mon Sep 17 00:00:00 2001 From: Krista 'DarthMama' Bennett Date: Thu, 29 Aug 2019 22:28:17 +0200 Subject: [PATCH] ensure desired gtest directory is first include dir to avoid problems with coexisting default installs (especially ancient ones ;) --- test/Makefile | 4 ++-- test/README.md | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/test/Makefile b/test/Makefile index 0a53f483..60c90dc9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -52,10 +52,10 @@ else ifeq ($(OPENPGP),NETPGP) endif endif -CXXFLAGS:=$(filter-out -DNDEBUG,$(CXXFLAGS)) +CXXFLAGS:=-I$(GTEST_INC_DIR) $(filter-out -DNDEBUG,$(CXXFLAGS)) # FIXME Possibly missing incdirs: ASN1C_INC -CXXFLAGS+= -I./src -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -I$(GTEST_INC_DIR) -Wno-deprecated +CXXFLAGS+= -I./src -I../sync $(CPPUNIT_INC) $(INC_FLAGS) -Wno-deprecated ifeq ($(OPENPGP),GPG) CXXFLAGS+= -DUSE_GPG $(GPGME_INC) diff --git a/test/README.md b/test/README.md index c52754a0..6ea61fd6 100644 --- a/test/README.md +++ b/test/README.md @@ -43,15 +43,18 @@ Presuming the above works, then from the top test directory, simply run make. # Running the Engine Test Suite -If you simply want to run the suite and see what tests fail, either: +## To simply run the test suite and see what tests fail... + +Do one of: 1. make test OR 2. python3 \ ./EngineTests -To run individual tests, especially for debugging purposes: +## To run individual test suites, especially for debugging purposes -1. Blah, and, for example, -2. {lldb ./EngineTests some-blah-args-here} +1. To run sequentially, IN THE SAME PROCESS: ./EngineTests TestSuiteName* (for example, for DeleteKeyTest: ./EngineTests DeleteKeyTest*) +2. To debug the same: lldb ./EngineTests TestSuiteName* +3. To run sequentially IN DIFFERENT PROCESSES: (FIXME - is this really the case?) # Creating new tests