From 67a926282b6976d8106e9cbca1f64d5c5a00569c Mon Sep 17 00:00:00 2001
From: garciay <yann.garcia@fscom.fr>
Date: Mon, 25 May 2020 08:53:10 +0200
Subject: [PATCH] Remove sudo to execute test system

---
 docker/Dockerfile                  | 3 ++-
 scripts/mec_generate_makefile.bash | 4 ++--
 scripts/update_mec_project.bash    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 scripts/mec_generate_makefile.bash

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57678aa..1abc9d0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -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"]
 
diff --git a/scripts/mec_generate_makefile.bash b/scripts/mec_generate_makefile.bash
old mode 100755
new mode 100644
index 8bfc372..ec9c3ca
--- a/scripts/mec_generate_makefile.bash
+++ b/scripts/mec_generate_makefile.bash
@@ -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
diff --git a/scripts/update_mec_project.bash b/scripts/update_mec_project.bash
index d52be51..40ac10f 100755
--- a/scripts/update_mec_project.bash
+++ b/scripts/update_mec_project.bash
@@ -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
-- 
GitLab