Browse Source

Changes in build to make NETPGP work in the tests.

doc_update_sequoia
Krista Bennett 4 years ago
parent
commit
13ac482c9b
3 changed files with 11 additions and 6 deletions
  1. +7
    -2
      test/Makefile
  2. +2
    -2
      test/src/EngineTestSuite.cc
  3. +2
    -2
      test/src/pEpTestOutput.cc

+ 7
- 2
test/Makefile View File

@ -17,13 +17,14 @@ SRCS := $(wildcard src/*.cc) $(wildcard src/*/*.cc)
OBJS := $(addsuffix .o,$(basename $(SRCS)))
DEPS := $(OBJS:.o=.d)
INC_DIRS := ./include /usr/local/include
INC_DIRS := ./include /usr/local/include ../src ../sync ../asn.1
INC_FLAGS := $(addprefix -I,$(INC_DIRS)) $(GPGME_INC) $(CPPUNIT_INC)
LDFLAGS += -L/usr/local/lib
CFLAGS += -Wno-deprecated
CXXFLAGS += -Wno-deprecated
CFLAGS:=$(filter-out -Wall,$(CFLAGS))
LDFLAGS+= $(ETPAN_LIB) $(CPPUNIT_LIB) -L../asn.1 -L../src
LDLIBS+= -letpan -lpEpEngine -lstdc++ -lasn1
@ -34,6 +35,7 @@ endif
ifeq ($(OPENPGP),NETPGP)
LDLIBS+= -lnetpgp
CFLAGS+= -DUSE_NETPGP
ifeq ($(BUILD_FOR),Linux)
LDLIBS+= -ltre
endif
@ -88,8 +90,11 @@ CPPFLAGS += $(INC_FLAGS) -MMD -MP
all: suitemaker $(TARGET) test_home_ scripts
%.o: %.cc
$(CXX) -c $(CFLAGS) $(CPPFLAGS) $< -o $@
$(TARGET): $(OBJS)
$(CXX) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $@
$(CXX) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS) -o $@
.PHONY: suitemaker
suitemaker:


+ 2
- 2
test/src/EngineTestSuite.cc View File

@ -10,8 +10,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#import <string>
#import <vector>
#include <string>
#include <vector>
#include <utility>
#include "platform_unix.h"


+ 2
- 2
test/src/pEpTestOutput.cc View File

@ -16,7 +16,7 @@ namespace Test {
cout << setw(width);
if (num_tests) {
double percentage = ((num_tests - failures) / (double)num_tests) * 100;
cout << std::fixed << setprecision(1) << percentage << "\%";
cout << std::fixed << setprecision(1) << percentage << "%";
}
else
cout << "N/A";
@ -112,4 +112,4 @@ namespace Test {
void pEpTestOutput::assertment(const Source& s) {
_test_errors.push_back(s);
}
}
}

Loading…
Cancel
Save