Skip to content
Snippets Groups Projects
Commit 42c918f7 authored by Botond Baranyi's avatar Botond Baranyi
Browse files

Fixed fuzzy regtest with dynamic linking


Change-Id: Ibe9a4868a200af5c588b55d0b5a3092f71ae3d0e
Signed-off-by: default avatarBotond Baranyi <botond.baranyi@ericsson.com>
parent 7a07a4ce
No related branches found
No related tags found
No related merge requests found
......@@ -46,7 +46,13 @@ CXXDEPFLAGS = -MM
#COMPILER_FLAGS +=
# Execution mode: (either ttcn3 or ttcn3-parallel)
TTCN3_LIB := ttcn3-rt2
TTCN3_LIB := ttcn3-rt2$(DYNAMIC_SUFFIX)
ifdef DYN
LIB_SUFFIX := .so
else
LIB_SUFFIX := .a
endif
#
# You may change these variables. Add your files if necessary...
......@@ -98,7 +104,7 @@ all: $(TARGET) ;
objects: $(OBJECTS) ;
$(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
$(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB)$(LIB_SUFFIX)
$(CXX) $(LDFLAGS) -o $@ $^ \
-L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
-L$(OPENSSL_DIR)/lib -lcrypto \
......@@ -117,7 +123,7 @@ $(TARGET): $(OBJECTS) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
$(GENERATED_SOURCES) $(GENERATED_HEADERS): compile
@if [ ! -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
compile:: $(firstword $(TTCN3_COMPILER)) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB).a
compile:: $(firstword $(TTCN3_COMPILER)) $(TTCN3_DIR)/lib/lib$(TTCN3_LIB)$(LIB_SUFFIX)
@if [ -f $@ ]; then $(RM) compile; $(MAKE) compile; fi
compile:: $(TTCN3_MODULES) $(ASN1_MODULES)
......
......@@ -26,6 +26,15 @@ ifeq ($(COVERAGE), yes)
COVERAGE_FLAG += -C
endif
ifdef DYN
ifeq ($(PLATFORM), WIN32)
export PATH+=:$(TTCN3_DIR)/lib:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
else
export LD_LIBRARY_PATH+=:$(ABS_SRC)/$(DIR_SINGLE):$(ABS_SRC)/$(DIR_PARALLEL):
endif
DYNFLAG := -l
endif
DIR_SINGLE := dir_single_mode
DIR_PARALLEL := dir_parallel_mode
GENERATED_DIRS := $(DIR_SINGLE) $(DIR_PARALLEL)
......@@ -38,12 +47,12 @@ all: $(GENERATED_DIRS)
$(DIR_SINGLE):
mkdir $@
cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done
cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -s -e $(RUNNABLE) ./* && $(MAKE_PROG)
cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) $(RT2_FLAG) $(DYNFLAG) -s -e $(RUNNABLE) ./* && $(MAKE_PROG)
$(DIR_PARALLEL):
mkdir $@
cd $@ && for file in $(FILES); do ln -s ../$$file || exit; done
cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) -e $(RUNNABLE) ./* && $(MAKE_PROG)
cd $@ && $(TTCN3_DIR)/bin/ttcn3_makefilegen $(COVERAGE_FLAG) $(SPLIT_FLAG) $(RT2_FLAG) $(DYNFLAG) -e $(RUNNABLE) ./* && $(MAKE_PROG)
run: $(GENERATED_DIRS)
cd $(DIR_SINGLE) && ./$(RUNNABLE) $(CFG) && grep "Overall verdict: pass" *.log
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment