Commit 1640dbbb authored by Garcia's avatar Garcia
Browse files

Update Dockerfile

parent dbccec1e

docker/Dockerfile

+6 −5
Original line number Diff line number Diff line
@@ -76,13 +76,14 @@ RUN echo "docker-titan-STF549" > /etc/hostname \ 


USER etsi



ADD ~/.ssh/id_rsa /home/etsi/.ssh/id_rsa

ADD ~/.ssh/id_rsa_pub /home/etsi/.ssh/id_rsa_pub



RUN cd /home/etsi \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \

    && cd /home/etsi/dev \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev



ADD id_rsa* /home/etsi/.ssh/id_rsa



RUN cd /home/etsi/dev \

    && git clone https://forge.etsi.org/gitlab/emergency-communications/NG112 ./STF549_Ng112 \

    && cd /home/etsi/dev/STF549_Ng112 \

    && git checkout TTCN_3_Developments \

    && cd /home/etsi/dev/STF549_Ng112/ttcn \

    && svn co --non-interactive svn+ssh://forge.etsi.org/svn/LibSip/trunk ./LibSip \

docker/build-container.sh

+2 −0
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ then 
    then

      docker rmi -f $(docker images -q)

    fi

    cp ~/.ssh/id_rsa* .

    docker build --tag stf525_its --force-rm .

    rm ./id_rsa*

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

scripts/ng112.bash

+7 −7
Original line number Diff line number Diff line
@@ -178,19 +178,19 @@ if [ "$1" == "prof" ] 
then

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -D_XOPEN_SOURCE=700 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -D_XOPEN_SOURCE=700 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

else

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

fi

ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_EMCOM)/include -I$(PATH_DEV_EMCOM)/framework/include -I../include -I../../LibEmcom/Common/include -I../../LibEmcom/LibNg112/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'

ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$\(HOME_FRAMEWORKS\)\/osip\/src\/osipparser2\/\.libs -losipparser2/g'
@@ -237,6 +237,6 @@ if [ "$?" == "1" ] 
then

    f_exit "Failed to generate ATS source code" 9

fi

export LD_LIBRARY_PATH=~export LD_LIBRARY_PATH=~/frameworks/osip/src/osipparser2/.libs:$LD_LIBRARY_PATH

export LD_LIBRARY_PATH=~/frameworks/osip/src/osipparser2/.libs:$LD_LIBRARY_PATH

../bin/Ats${ATS_NAME} -v

f_exit "Build done successfully" 0

scripts/testcodec_generate_makefile.bash

+17 −17
Original line number Diff line number Diff line
@@ -178,19 +178,19 @@ if [ "$1" == "prof" ] 
then

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -D_XOPEN_SOURCE=700 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -D_XOPEN_SOURCE=700 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

else

    if [ "${OSTYPE}" == "cygwin" ]

    then

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    else

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector/g'

        CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -DAS_USE_SSL -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

    fi

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector/g'

    LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fstack-check -fstack-protector -fsanitize=address -fno-omit-frame-pointer -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'

fi

ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_EMCOM)/include -I$(PATH_DEV_EMCOM)/framework/include -I../include -I../../LibEmcom/Common/include -I../../LibEmcom/LibNg112/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'

ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$\(HOME_FRAMEWORKS\)\/osip\/src\/osipparser2\/\.libs -losipparser2/g'

ttcn/AtsNg112/AtsNg112_TestCases.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ module AtsNg112_TestCases { 
                    // Extract Circle element from Tuple

                    v_temp := v_geopriv.location_info.elem_list[0];

                    v_result := decvalue_unichar(v_temp, v_circle);

                    if (match(v_circle, mw_circle(mw_center_group_pos(PX_CIRCLE_POS), mw_radius(PX_CIRCLE_UOM, PX_CIRCLE_BASE), PX_SRS_NAME))) {

                    log(match(v_circle, mw_circle(mw_center_group_pos(PX_CIRCLE_POS), mw_radius(PX_CIRCLE_UOM, (PX_CIRCLE_BASE - PX_DOUBLE_CMP_EPSILON .. PX_CIRCLE_BASE + PX_DOUBLE_CMP_EPSILON)), PX_SRS_NAME))); // Required by TITAN to get details in case of mismatch

                    if (match(v_circle, mw_circle(mw_center_group_pos(PX_CIRCLE_POS), mw_radius(PX_CIRCLE_UOM, (PX_CIRCLE_BASE - PX_DOUBLE_CMP_EPSILON .. PX_CIRCLE_BASE + PX_DOUBLE_CMP_EPSILON)), PX_SRS_NAME))) {

                      log("*** " & testcasename() & ": PASS: IUT successfully responds with a Point ***");

                      f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);

                    } else {