Browse Source

Reverted changes to gtest-parallel - It's admittedly a nice idea, but nowhere else in the engine to we ever make any assumptions that the builds are taking place online or about what the builder has on the system. Reverting.

pull/38/head
Krista Bennett 1 month ago
parent
commit
bbdb76242e
2 changed files with 16 additions and 11 deletions
  1. +3
    -6
      test/Makefile
  2. +13
    -5
      test/README.md

+ 3
- 6
test/Makefile View File

@ -7,7 +7,7 @@ HERE:=$(CURDIR)
GTEST_SRC_DIR:=/usr/src/gtest
GTEST_INC_DIR:=$(GTEST_SRC_DIR)/include
GTEST_PL:=gtest_parallel.py
GTEST_PL:=$(HOME)/src/gtest-parallel/gtest_parallel.py
include ../Makefile.conf # This should import changed values for the above from
# local.conf
@ -83,12 +83,9 @@ endif
.PHONY: all clean test
all: gtest_parallel.py
all:
make $(TARGET)
gtest_parallel.py:
wget https://raw.githubusercontent.com/google/gtest-parallel/master/gtest_parallel.py
%.d: %.cc
$(CXX) -MM $(CXXFLAGS) $(CPPFLAGS) $< \
| sed -e 's,\($*\)\.o[ :]*,\1.o $@: ,g' > $@
@ -105,7 +102,7 @@ test: all
clean:
$(RM) $(TARGET) $(TARGET).o $(TARGET).d $(OBJS) \
$(notdir $(basename $(OBJS))) $(DEPS) gtest_parallel.py
$(notdir $(basename $(OBJS))) $(DEPS)
$(RM) -rf ./pEp_test_home/*
# If only the target 'clean' is given, do not generate and include the


+ 13
- 5
test/README.md View File

@ -17,12 +17,14 @@ In addition to the engine requirements, you will need:
* `cmake`
* `python3`
* `wget` (for getting the `gtest-parallel.py` file)
* `git` (for getting the `gtest-parallel` repository, unless you grab the
tarball from somewhere)
## Building the prerequisites
The Engine test suite now requires (at least) one additional pieces to run:
The Engine test suite now requires (at least) two additional pieces to run:
* `googletest`
* `gtest-parallel`
How this proceeds depends on your platform and whether or not you use a packaged
distribution.
@ -108,6 +110,12 @@ Ubuntu](https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/))
(i.e. the absolute path of where the `src` and `include` directories were
above - for me, `/Users/krista/googletest/googletest`).
### Installing `gtest-parallel`
Pick a source directory and put your `gtest-parallel` source there
(e.g. via `git clone https://github.com/google/gtest-parallel.git`).
We'll deal more with this when preparing to compile the test suite.
## Building the test suite
@ -125,9 +133,9 @@ are:
* `GTEST_INC_DIR`: This is where the include files for googletest are located
(defaults to `$(GTEST_SRC_DIR)/include`)
* `GTEST_PL`: This is the full path to the *python file* `gtest_parallel.py`
(default presumes you let the Makefile download it into the test directory
i.e. it is `gtest_parallel.py`)
* `GTEST_PL`: This is the full path to the *python file* for `gtest_parallel`
(default presumes you cloned it under `src` in your home directory, i.e. it is
`$(HOME)/src/gtest-parallel/gtest_parallel.py`)
### Building


Loading…
Cancel
Save