Remove installed test for simplicity and easier development. Add environment variables from lib Makefile to test same with same env.

Author: lucasperin

tests/Makefile

@@ -4,53 +4,37 @@ CC = g++
 CPPFLAGS = -g -std=c++98 -DGTEST_HAS_PTHREAD=0
 DEFS = -DFIPS
 
-############# COMP ENVIRONMENT VARIABLES #############
-ifndef LIBCRYPTOSEC
-LIBCRYPTOSEC = ../libcryptosec.so
-endif
+############# ENVIRONMENT ###############################
+OPENSSL_PREFIX ?= /usr
+OPENSSL_LIBDIR ?= $(OPENSSL_PREFIX)/lib64
+OPENSSL_INCLUDEDIR ?= $(OPENSSL_PREFIX)/include
+LIBCRYPTOSEC ?= ../libcryptosec.so
+GTEST_INCLUDEDIR ?= /usr/include/gtest
+SRC_DIR ?= src/unit
 
-ifndef SSL_DIR
-SSL_DIR=/usr/local/ssl/include/
-endif
 
-ifndef GTEST_INCLUDE
-GTEST_DIR=/usr/include/gtest
-endif
-
-ifndef SRC_DIR
-SRC_DIR = src/unit
-endif
+############ DEPENDENCIES ############################
+#LIBS = $(LIBCRYPTOSEC) -lgtest -lcrypto -lssl -pthread
+#INCLUDES = -I../include -I$(GTEST_DIR) -I$(SSL_DIR)
 
-ARQ= $(shell uname -m)
-LIBDIR = /usr/lib
-ifeq ($(ARQ), x86_64)
-LIBDIR=/usr/lib64
-endif
 
-############ DEPENDENCIES ############################
-LIBS = $(LIBCRYPTOSEC) -lgtest -lcrypto -lssl -pthread
-INCLUDES = -I../include -I$(GTEST_DIR) -I$(SSL_DIR)
+LIBS = $(LIBCRYPTOSEC) -L$(OPENSSL_LIBDIR) -Wl,-rpath,$(OPENSSL_LIBDIR) -lcrypto -lgtest -pthread
+INCLUDES = -I$(OPENSSL_INCLUDEDIR) -I$(GTEST_INCLUDEDIR) -I../include
 
 ########### OBJECTS ##################################
 TEST_SRCS += $(wildcard $(SRC_DIR)/*.cpp)
 OBJS += $(TEST_SRCS:.cpp=.o)
 
 ########### AUX TARGETS ##############################
 .set_static:
-	$(eval LIBS= $(LIBCRYPTOSEC) -lgtest)
-
-.set_installed:
-	$(eval INCLUDES=-I/usr/include/libcryptosec -I$(GTEST_DIR) -I$(SSL_DIR))
+	$(eval LIBS= $(LIBCRYPTOSEC) -lgtest -pthread)
 
 .set_engine:
 	$(eval DEFS+= -DENGINE_COMP)
 
 .check_compiled:
 	@test -s $(LIBCRYPTOSEC) || { echo "You should COMPILE libcryptosec first!"; exit 1; }
 
-.check_installed:
-	@test -s $(LIBDIR)/libcryptosec.so || { echo "You should INSTALL libcryptosec first!"; exit 1; }
-
 %.o: %.cpp
 	$(CC) $(CPPFLAGS) $(DEFS) $(INCLUDES) -O0 -Wall -c -o "$@" "$<"
 
@@ -78,10 +62,6 @@ test_engine_dynamic: .check_compiled .set_engine .comp .run_engine
 
 test_engine_static: .check_compiled .set_engine .set_static .comp .run_engine
 
-installed_test_dynamic: .check_installed .set_installed .comp .run
-
-installed_test_static: .check_installed .set_static .set_installed .comp .run
-
 clean:
 	rm -rf ./$(SRC_DIR)/*.o $(NAME)