Add support of splitted ATSs (e,g, make ATS=ATsPki.Itss or make ATS=AtsPki.Pki) (314e7592) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

Makefile

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,10 @@

	ifeq (,$(ATS))		ifeq (,$(ATS))
	$(error ATS shall be defined)		$(error ATS shall be defined)
			else
			y := $(subst ., ,$(ATS))
			ATS := $(word 1, $(y))
			SUB_ATS := $(word 2, $(y))
	endif		endif

	ifeq (,$(TOPDIR))		ifeq (,$(TOPDIR))
	@@ -35,7 +39,7 @@ $$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $$(if $$(filter /%, $
	endef		endef

	all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src /usr/include/jsoncpp /usr/include/libxml2 /usr/include/libzip		all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src /usr/include/jsoncpp /usr/include/libxml2 /usr/include/libzip
	defines += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) AS_USE_SSL _GNU_SOURCE		defines += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) $(SUB_ATS) AS_USE_SSL _GNU_SOURCE
	libs += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs		libs += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs

	ifeq (Windows_NT,$(OS))		ifeq (Windows_NT,$(OS))
	@@ -89,7 +93,7 @@ cc_objects := $(patsubst %.cc, $(outdir)/%.o, $(cc_sources))

	.PHONY: all FORCE echo		.PHONY: all FORCE echo

	all: $(bindir) $(outdir) $(bindir)/$(ATS)$(EXE)		all: $(bindir) $(outdir) $(bindir)/$(ATS)$(SUB_ATS)$(EXE)

	echo_sources:		echo_sources:
	@echo -e "$(addsuffix \n,$(all_sources))"		@echo -e "$(addsuffix \n,$(all_sources))"
	@@ -103,7 +107,7 @@ echo: echo_sources
	@echo -e "defines: $(addsuffix \n, $(defines))"		@echo -e "defines: $(addsuffix \n, $(defines))"

	clean:		clean:
	rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so		rm -f $(outdir)/$(ATS)$(SUB_ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so
	# rm -f $(outdir)/asn1/.so $(outdir)/asn1/.o $(outdir)/asn1/.c $(outdir)/asn1/.h $(outdir)/asn1/Makefile.am.libasncodec		# rm -f $(outdir)/asn1/.so $(outdir)/asn1/.o $(outdir)/asn1/.c $(outdir)/asn1/.h $(outdir)/asn1/Makefile.am.libasncodec

	regen: force_regen $(outdir)/.generate		regen: force_regen $(outdir)/.generate
	@@ -125,7 +129,7 @@ t3d: all
	$(outdir) $(outdir)/asn1 $(bindir):		$(outdir) $(outdir)/asn1 $(bindir):
	mkdir -p $@		mkdir -p $@

	$(bindir)/$(ATS)$(EXE): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects)		$(bindir)/$(ATS)$(SUB_ATS)$(EXE): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects)
	g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs)		g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs)

	$(gen_objects) :%.o :%.cc		$(gen_objects) :%.o :%.cc

etc/AtsPki/AtsPki_Commsignia.cfg_

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -156,9 +156,9 @@ ItsPki_TestCases.TC_SECPKI_ITSS_ENR_01_BV
	# If the enrolment request of the IUT is an initial enrolment request, the itsId (contained in the InnerECRequest) shall be set to the canonical identifier, the signer (contained in the outer EtsiTs1030971Data-Signed) shall be set to self and the outer signature shall be computed using the canonical private key.		# If the enrolment request of the IUT is an initial enrolment request, the itsId (contained in the InnerECRequest) shall be set to the canonical identifier, the signer (contained in the outer EtsiTs1030971Data-Signed) shall be set to self and the outer signature shall be computed using the canonical private key.
	#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_02_BV		#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_02_BV
	# In presence of a valid EC, the enrolment request of the IUT is a rekeying enrolment request with the itsId (contained in the InnerECRequest) and the SignerIdentifier (contained in the outer EtsiTs1030971Data-Signed) both declared as digest containing the HashedId8 of the EC and the outer signature computed using the current valid EC private key corresponding to the verification public key.		# In presence of a valid EC, the enrolment request of the IUT is a rekeying enrolment request with the itsId (contained in the InnerECRequest) and the SignerIdentifier (contained in the outer EtsiTs1030971Data-Signed) both declared as digest containing the HashedId8 of the EC and the outer signature computed using the current valid EC private key corresponding to the verification public key.
	#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_03_BV		#ItsPkiItss_TestCases.TC_SECPKI_ITSS_ENR_03_BV
	#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_06_BV		#ItsPkiItss_TestCases.TC_SECPKI_ITSS_ENR_06_BV
	#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_07_BV		#ItsPkiItss_TestCases.TC_SECPKI_ITSS_ENR_07_BV


	[MAIN_CONTROLLER]		[MAIN_CONTROLLER]

AtsPki @ 4dee8682

Original line number	Original line	Diff line number	Diff line
	Subproject commit c148ec0980f14bc36a74b80aa6cfc83ff8b8d817		Subproject commit 4dee8682b2427295ecc99ff2de9113df1d98a7b6

Admin message