Commit 67a92628 authored by Yann Garcia's avatar Yann Garcia
Browse files

Remove sudo to execute test system

parent da3f6693

docker/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ USER etsi 


RUN cd ${HOME} \

    && export PATH=$HOME/bin:$PATH \

    && ls ${HOME}/etc/init.d/*.sh | while read S; do /bin/bash -c "$S" || exit 1; done

    && ls ${HOME}/etc/init.d/*.sh | while read S; do /bin/bash -c "$S" || exit 1; done \

    && rm -fr ${HOME}/etc



CMD ["/bin/bash"]

scripts/mec_generate_makefile.bash

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ ADD_PORT='/PLATFORM = /aPORT=12000' 
sed --in-place "${ADD_PORT}" ./Makefile

sed --in-place "${ADD_HOST}" ./Makefile

ADD_RUN_LINE_1='$arun: all'

ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)'

ADD_RUN_LINE_2='$a\\t@$(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)'

sed --in-place "${ADD_RUN_LINE_1}" ./Makefile 

sed --in-place "${ADD_RUN_LINE_2}" ./Makefile 

ADD_RUN_LINE_1='$arun_d: all'
@@ -196,7 +196,7 @@ ADD_RUN_LINE_2='$a\\t@gdb --args $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' 
sed --in-place "${ADD_RUN_LINE_1}" ./Makefile 

sed --in-place "${ADD_RUN_LINE_2}" ./Makefile 

ADD_RUN_LINE_1='$arun_v: all'

ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) valgrind -v --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes --run-cxx-freeres=yes $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)'

ADD_RUN_LINE_2='$a\\t@valgrind -v --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes --run-cxx-freeres=yes $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)'

sed --in-place "${ADD_RUN_LINE_1}" ./Makefile 

sed --in-place "${ADD_RUN_LINE_2}" ./Makefile 

# Add gendoc entry

scripts/update_mec_project.bash

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ do 
        chmod -R 775 ${TTCN_3_DST_PATH}/$i

    fi

    cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

    cp ${TTCN_3_ORG_PATH}/../etc/$i/*.cfg ${TTCN_3_DST_PATH}/$i/etc

    cp ${TTCN_3_ORG_PATH}/../etc/$i/*.cf* ${TTCN_3_DST_PATH}/$i/etc

    if [ -d ${TTCN_3_ORG_PATH}/../etc_simu ]

    then

        mkdir -p ${TTCN_3_ORG_PATH}/../etc_simu