Commit 15907cdb authored by Maxime Perrotin's avatar Maxime Perrotin

Fix for test21

cant use cat directly to concatenate multiple asn1 files, because if
there is no newline at the end of the file, the last END keyword is
joined to the next word, provoking a parsing error from the ASN1
compiler
parent 7bc2d1d4
...@@ -62,10 +62,9 @@ build/deploymentview_final/Makefile: build/main.aadl ...@@ -62,10 +62,9 @@ build/deploymentview_final/Makefile: build/main.aadl
@@END_TABLE@@ @@END_TABLE@@
@@END_INLINE@@ @@END_INLINE@@
mkdir -p ${PROJECT_CACHE} && mkdir -p ${DATAVIEW_PATH} mkdir -p ${PROJECT_CACHE} && mkdir -p ${DATAVIEW_PATH}
@@-- Create dataview-uniq.asn @@-- Create dataview-uniq.asn by concatenating all asn1 input files
@@INLINE( )( )(\n)@@ @@-- Don't use cat, because files need newlines in between
cat $^ > $@ sed -e '$$s/$$/\n/' -s $^ > $@
@@END_INLINE@@
build/system_config.h: $(wildcard */*/wrappers/*_system_config.h) build/system_config.h: $(wildcard */*/wrappers/*_system_config.h)
cat $^ > $@ cat $^ > $@
......
...@@ -3,22 +3,17 @@ KAZOO=../../kazoo ...@@ -3,22 +3,17 @@ KAZOO=../../kazoo
all: test-parse all: test-parse
test-parse: clean test-parse: clean
$(KAZOO) --gw \ $(KAZOO) --gw -p -o output.pohic --glue --debug
-o output \ time $(MAKE) -C output.pohic dataview
--glue \
--debug && time $(MAKE) -C output dataview
gdb: clean gdb: clean
gdb --args $(KAZOO) --gw \ gdb --args $(KAZOO) --gw \
-o output \ -o output.pohic \
-p \
--glue \ --glue \
--debug \ --debug
-i InterfaceView.aadl \
-c DeploymentView.aadl \
-d DataView.aadl \
../common/ocarina_components.aadl && $(MAKE) -C output dataview
clean: clean:
rm -rf output rm -rf output.pohic
.PHONY: clean test-parse gdb .PHONY: clean test-parse gdb
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment