per changes
diff --git a/examples/sample.source.TAP3/Makefile b/examples/sample.source.TAP3/Makefile
index ac78365..491d08c 100644
--- a/examples/sample.source.TAP3/Makefile
+++ b/examples/sample.source.TAP3/Makefile
@@ -700,7 +700,7 @@
regen: regenerate-from-asn1-source
regenerate-from-asn1-source:
- asn1c -pdu=DataInterChange ../tap3.asn1
+ ../../asn1c/asn1c -S ../../skeletons -pdu=DataInterChange ../tap3.asn1
DataInterChange.c: ../sample.makefile.regen ../tap3.asn1
@@ -726,12 +726,12 @@
for b in 1 17 33 980 8192; do \
echo "Recoding $$f into XER and back ($$b)..."; \
./${TARGET} -b $$b -iber -oxer $$f > ./.tmp.1.$$$$ || exit 2; \
- ./${TARGET} -b $$b -ixer -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \
- diff ./.tmp.1.$$$$ ./.tmp.2.$$$$ || exit 2; \
+ ./${TARGET} -b $$b -ixer -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
+ diff ./.tmp.1.$$$$ ./.tmp.2.$$$$ || exit 4; \
rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \
- ./${TARGET} -J0.0001 -n 1000 -b $$b -iber -onull $$f || exit 2; \
- ./${TARGET} -J0.001 -n 1000 -b $$b -iber -onull $$f || exit 2; \
+ ./${TARGET} -J0.0001 -n 1000 -b $$b -iber -onull $$f || exit 5; \
+ ./${TARGET} -J0.001 -n 1000 -b $$b -iber -onull $$f || exit 6; \
done; done; fi
check-xer:
@@ -740,41 +740,41 @@
for b in 1 17 33 980 8192; do \
echo "Recoding $$f into DER and back ($$b)..."; \
./${TARGET} -b $$b -ixer -oder $$f > ./.tmp.1.$$$$ || exit 2; \
- ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \
- diff $$f ./.tmp.2.$$$$ || exit 2; \
+ ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
+ diff $$f ./.tmp.2.$$$$ || exit 4; \
rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \
- ./${TARGET} -J0.0001 -n 1000 -b $$b -ixer -onull $$f || exit 2; \
- ./${TARGET} -J0.001 -n 1000 -b $$b -ixer -onull $$f || exit 2; \
+ ./${TARGET} -J0.0001 -n 1000 -b $$b -ixer -onull $$f || exit 5; \
+ ./${TARGET} -J0.001 -n 1000 -b $$b -ixer -onull $$f || exit 6; \
done; done; fi
check-per:
- @if test -f sample-DataInterChange-1.per ; then \
- for f in sample-DataInterChange-[1-9].per; do \
+ @if test -f sample-DataInterChange-1-nopad.per ; then \
+ for f in sample-DataInterChange-[1-9]-nopad.per; do \
for b in 1 17 33 980 8192; do \
- echo "Recoding $$f into DER into XER and back ($$b)..."; \
- ./${TARGET} -b $$b -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \
- ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \
- ./${TARGET} -b $$b -ixer -oder ./.tmp.2.$$$$ > ./.tmp.3.$$$$ || exit 2; \
- diff ./.tmp.1.$$$$ ./.tmp.3.$$$$ || exit 2; \
+ echo "Recoding non-padded $$f into DER into XER and back ($$b)..."; \
+ ./${TARGET} -b $$b -per-nopad -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \
+ ./${TARGET} -b $$b -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 3; \
+ ./${TARGET} -b $$b -ixer -oder ./.tmp.2.$$$$ > ./.tmp.3.$$$$ || exit 4; \
+ diff ./.tmp.1.$$$$ ./.tmp.3.$$$$ || exit 5; \
rm -f ./.tmp.[123].$$$$; \
echo "Test junking $$f (please wait)..."; \
- ./${TARGET} -J0.0001 -n 1000 -b $$b -iper -onull $$f || exit 2; \
- ./${TARGET} -J0.001 -n 1000 -b $$b -iper -onull $$f || exit 2; \
+ ./${TARGET} -J0.0001 -n 1000 -b $$b -per-nopad -iper -onull $$f || exit 6; \
+ ./${TARGET} -J0.001 -n 1000 -b $$b -per-nopad -iper -onull $$f || exit 7; \
done; done; fi
- @if test -f sample-DataInterChange-1-padded.per ; then \
- for f in sample-*-[1-9]-padded.per; do \
+ @if test -f sample-DataInterChange-1.per ; then \
+ for f in sample-*-[1-9].per; do \
pdu=`echo $$f | sed -E -e "s/sample-([A-Za-z-]+)-[0-9].*/\1/"`; \
for b in 1 17 33 980 8192; do \
- echo "Recoding byte-padded $$f into DER into XER and back ($$b)..."; \
- ./${TARGET} -b $$b -per-padded -p $$pdu -iper -oder $$f > ./.tmp.1.$$$$ || exit 2; \
- ./${TARGET} -b $$b -p $$pdu -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 2; \
- ./${TARGET} -b $$b -p $$pdu -ixer -oper ./.tmp.2.$$$$ > ./.tmp.1.$$$$ || exit 2; \
- diff $$f ./.tmp.1.$$$$ || exit 2; \
+ echo "Recoding $$f into DER into XER and back ($$b)..."; \
+ ./${TARGET} -b $$b -p $$pdu -iper -oder $$f > ./.tmp.1.$$$$ || exit 3; \
+ ./${TARGET} -b $$b -p $$pdu -iber -oxer ./.tmp.1.$$$$ > ./.tmp.2.$$$$ || exit 4; \
+ ./${TARGET} -b $$b -p $$pdu -ixer -oper ./.tmp.2.$$$$ > ./.tmp.1.$$$$ || exit 5; \
+ diff $$f ./.tmp.1.$$$$ || exit 6; \
rm -f ./.tmp.[12].$$$$; \
echo "Test junking $$f (please wait)..."; \
- ./${TARGET} -J0.0001 -n 1000 -b $$b -per-padded -iper -onull $$f || exit 2; \
- ./${TARGET} -J0.001 -n 1000 -b $$b -per-padded -iper -onull $$f || exit 2; \
+ ./${TARGET} -J0.0001 -n 1000 -b $$b -iper -onull $$f || exit 7; \
+ ./${TARGET} -J0.001 -n 1000 -b $$b -iper -onull $$f || exit 8; \
done; done; fi
distclean: clean