Bug fixed in virtualization (e3a7ba38) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

install.sh

+29 −20

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		set -vx

		BRANCH=TTF_T036
		ASN1_BRANCH=devel2
		ASN1_BRANCH=TTF_T036
		BASE_PATH=`pwd`

		#git checkout $BRANCH
		@@ -13,7 +13,12 @@ BASE_PATH=`pwd`
		for i in `find $BASE_PATH/ttcn -type d -name "Ats*"`
		do
		cd $i
		if [ "$i" == "AtsGeoNetworking" ]
		then
		git checkout --recurse-submodules TTF_T042
		else
		git checkout --recurse-submodules $BRANCH
		fi
		done

		for i in `find $BASE_PATH/ttcn/Ats* -type d -name "asn1"`
		@@ -22,32 +27,34 @@ do
		git checkout --recurse-submodules $ASN1_BRANCH
		if [ -f ETSI-ITS-CDD.asn ]
		then
		ln ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn
		ln -sf ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn
		elif [ -f CAM-PDU-Descriptions.asn ]
		then
		ln CAM-PDU-Descriptions.asn CAM_PDU_Descriptions.asn
		ln -sf CAM-PDU-Descriptions.asn CAM_PDU_Descriptions.asn
		elif [ -f DENM-PDU-Descriptions.asn ]
		then
		ln DENM-PDU-Descriptions.asn DENM_PDU_Descriptions.asn
		ln -sf DENM-PDU-Descriptions.asn DENM_PDU_Descriptions.asn
		elif [ -f VAM-PDU-Descriptions.asn ]
		then
		ln VAM-PDU-Descriptions.asn VAM_PDU_Descriptions.asn
		ln motorcyclist-special-container.asn motorcyclist_special_container.asn
		ln -sf VAM-PDU-Descriptions.asn VAM_PDU_Descriptions.asn
		ln -sf motorcyclist-special-container.asn motorcyclist_special_container.asn
		elif [ -f asn/CPM-PDU-Descriptions.asn ]
		then
		ln asn/CPM-PDU-Descriptions.asn asn/CPM_PDU_Descriptions.asn
		ln asn/CPM-OriginatingStationContainers.asn asn/CPM_OriginatingStationContainers.asn
		ln asn/CPM-PerceivedObjectContainer.asn asn/CPM_PerceivedObjectContainer.asn
		ln asn/CPM-PerceptionRegionContainer.asn asn/CPM_PerceptionRegionContainer.asn
		ln asn/CPM-SensorInformationContainer.asn asn/CPM_SensorInformationContainer.asn
		cd asn
		ln -sf CPM-PDU-Descriptions.asn CPM_PDU_Descriptions.asn
		ln -sf CPM-OriginatingStationContainers.asn CPM_OriginatingStationContainers.asn
		ln -sf CPM-PerceivedObjectContainer.asn CPM_PerceivedObjectContainer.asn
		ln -sf CPM-PerceptionRegionContainer.asn CPM_PerceptionRegionContainer.asn
		ln -sf CPM-SensorInformationContainer.asn CPM_SensorInformationContainer.asn
		cd -
		elif [ -f IVIM-PDU-Descriptions.asn ]
		then
		ln IVIM-PDU-Descriptions.asn IVIM_PDU_Descriptions.asn
		ln MAPEM-PDU-Descriptions.asn MAPEM_PDU_Descriptions.asn
		ln RTCMEM-PDU-Descriptions.asn RTCMEM_PDU_Descriptions.asn
		ln SPATEM-PDU-Descriptions.asn SPATEM_PDU_Descriptions.asn
		ln SREM-PDU-Descriptions.asn SREM_PDU_Descriptions.asn
		ln SSEM-PDU-Descriptions.asn SSEM_PDU_Descriptions.asn
		ln -sf IVIM-PDU-Descriptions.asn IVIM_PDU_Descriptions.asn
		ln -sf MAPEM-PDU-Descriptions.asn MAPEM_PDU_Descriptions.asn
		ln -sf RTCMEM-PDU-Descriptions.asn RTCMEM_PDU_Descriptions.asn
		ln -sf SPATEM-PDU-Descriptions.asn SPATEM_PDU_Descriptions.asn
		ln -sf SREM-PDU-Descriptions.asn SREM_PDU_Descriptions.asn
		ln -sf SSEM-PDU-Descriptions.asn SSEM_PDU_Descriptions.asn
		fi
		SUB_DIRS=`find . -type d`
		if [ "SUB_DIRS" != "" ]
		@@ -58,7 +65,7 @@ do
		git checkout --recurse-submodules $ASN1_BRANCH
		if [ -f ETSI-ITS-CDD.asn ]
		then
		ln ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn
		ln -sf ETSI-ITS-CDD.asn ETSI_ITS_CDD.asn
		fi
		cd -
		done
		@@ -75,11 +82,13 @@ else
		git checkout devel
		fi
		cd ./ttcn/LibHttp
		ln module_its.mk module.mk
		ln -sf module_its.mk module.mk

		cd $BASE_PATH/ttcn/LibIts
		git checkout devel2

		cd $BASE_PATH/ttcn/LibCommon
		ln -sf ../patch_lib_common_titan/module.mk module.mk
		cd $BASE_PATH
		ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/module.mk

virtualization/docker-dev/Dockerfile.stfubuntu

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \
		libxml2-dev \
		libxml2-utils \
		libyaml-dev \
		libzip-dev \
		lsof \
		ntp \
		openssh-server \
		@@ -55,6 +56,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \
		texlive-latex-extra \
		tzdata \
		valgrind \
		unzip \
		xutils-dev \
		xsltproc \
		&& DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \

virtualization/docker-dev/home/etc/init.d/50-ats.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,8 @@ cd ${HOME}/dev/TS.ITS/scripts \|\| exit 1

		echo -e "****************************\n Build test suites\n*****************************\n"
		cd ${HOME}/dev/TS.ITS
		ATS_LIST="AtsCAM AtsDENM AtsCPS AtsVRU AtsIS AtsBTP AtsGeoNetworking AtsPki AtsSecurity AtsMBR"
		#ATS_LIST="AtsCAM AtsDENM AtsCPS AtsVRU AtsIS AtsBTP AtsGeoNetworking AtsPki AtsSecurity AtsMBR"
		ATS_LIST="AtsCAM"
		for i in ${ATS_LIST}
		do
		export ATS=$i

virtualization/vagrant/provisioner.bash

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get update
		sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y
		sudo DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y
		sudo DEBIAN_FRONTEND=noninteractive apt-get update
		sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs gcc-9 g++-9 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libncurses5-dev expect libssl-dev libgcrypt-dev libxml2-dev libedit2 libedit-dev xutils-dev libjsoncpp-dev tcpdump libpcap-dev unzip sshpass kubuntu-desktop valgrind vim tzdata dos2unix xsltproc -y
		sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs gcc-9 g++-9 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libncurses5-dev expect libssl-dev libgcrypt-dev libxml2-dev libzip-dev libedit2 libedit-dev xutils-dev libjsoncpp-dev tcpdump libpcap-dev unzip sshpass kubuntu-desktop valgrind vim tzdata dos2unix xsltproc -y
		#sudo DEBIAN_FRONTEND=noninteractive apt --fix-broken install -y
		sudo DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y
		sudo DEBIAN_FRONTEND=noninteractive apt-get clean