aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/test/Makefile
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-09-27 10:07:20 +0200
committerBjörn Gustavsson <[email protected]>2013-09-27 10:07:20 +0200
commit5df3c4454fd5f302317bed7f5f83f20f7e5d9580 (patch)
tree2bddc4cd375b0f3867e8646c814598c34b18f7a8 /lib/asn1/test/Makefile
parent50e91bde3403c788bb1cabe644534f351d6dc1c1 (diff)
parente389b27d6c6971cee5be5a9b45703d9af6b6cb39 (diff)
downloadotp-5df3c4454fd5f302317bed7f5f83f20f7e5d9580.tar.gz
otp-5df3c4454fd5f302317bed7f5f83f20f7e5d9580.tar.bz2
otp-5df3c4454fd5f302317bed7f5f83f20f7e5d9580.zip
Merge branch 'bjorn/asn1/clean-up-tests' into maint
* bjorn/asn1/clean-up-tests: (24 commits) No longer compile the X420 specs for plain BER Combine the testSeqIndefinite/1 and testSetIndefinite/1 test cases Remove asn1_wrapper Eliminate the use of asn1_wrapper Simplify tests of CHOICE with OPTIONAL asn1_test_lib: Add roundtrip functions and use them everywhere Makefile: Release Emakefile to ensure warnings are treated as errors Don't allow unused exported functions in test case helpers Move out specific tests from asn1_test_lib testMegaco: Remove unused exported function msg11/0 ASN.1 tests: Don't export functions that are only locally called Remove unused pem_performance.erl file asn1_SUITE: Reinstate test of sub-constraint ASN.1 tests: Remove unused choice_extension.erl Remove unused compile() functions asn1_test_lib: Remove unnecessary loading of a compiled ASN.1 spec Slightly clean up testX420 asn1_SUITE: Combine most tests that use External.asn1 asn1ct_gen: Clean up process dictionary after generating asn1ct_parser2: Clean the process dictionary after parsing ...
Diffstat (limited to 'lib/asn1/test/Makefile')
-rw-r--r--lib/asn1/test/Makefile13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index a3fa4f2968..b1b08aa9f9 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -26,7 +26,6 @@ include $(ERL_TOP)/make/$(TARGET)/otp.mk
MODULES= \
h323test \
- choice_extension \
ber_decode_error \
testPrim \
testPrimStrings \
@@ -36,7 +35,6 @@ MODULES= \
testChoExtension \
testChoExternal \
testChoOptional \
- testChoOptionalImplicitTag \
testChoRecursive \
testChoTypeRefCho \
testChoTypeRefPrim \
@@ -51,12 +49,12 @@ MODULES= \
testSeqOptional \
testSeq2738 \
testSeqPrim \
+ testSeqSetIndefinite \
testSeqTag \
testSeqTypeRefCho \
testSeqTypeRefPrim \
testSeqTypeRefSeq \
testSeqTypeRefSet \
- testSeqIndefinite \
testSeqOf \
testSeqOfIndefinite \
testSeqOfCho \
@@ -72,7 +70,6 @@ MODULES= \
testSetTypeRefPrim \
testSetTypeRefSeq \
testSetTypeRefSet \
- testSetIndefinite \
testChoiceIndefinite \
testSetOf \
testSetOfCho \
@@ -100,7 +97,6 @@ MODULES= \
test_special_decode_performance \
testTCAP \
testSSLspecs \
- test_driver_load \
testSelectionTypes \
test_undecoded_rest \
testTcapsystem \
@@ -114,12 +110,9 @@ MODULES= \
asn1_test_lib \
asn1_app_test \
asn1_appup_test \
- asn1_wrapper \
asn1_SUITE \
error_SUITE
-SUITE= asn1_SUITE.erl
-
ERL_FILES= $(MODULES:%=%.erl)
HRL_FILES= External.hrl
@@ -144,7 +137,7 @@ EBIN = .
$(EMAKEFILE): $(ERL_FILES) $(HRL_FILES)
$(ERL_TOP)/make/make_emakefile $(ERL_COMPILE_FLAGS) -o$(EBIN) $(MODULES) $(ERL_FILES) >$(EMAKEFILE)
-tests debug opt: $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) $(EMAKEFILE)
+tests debug opt: $(EMAKEFILE)
clean:
rm -f core
@@ -161,7 +154,7 @@ release_spec: opt
release_tests_spec: opt
$(INSTALL_DIR) "$(RELSYSDIR)"
$(INSTALL_DIR) "$(RELSYSDIR)/asn1_SUITE_data"
- $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
+ $(INSTALL_DATA) $(EMAKEFILE) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)"
$(INSTALL_DATA) asn1.spec asn1.cover $(INSTALL_PROGS) "$(RELSYSDIR)"
chmod -R u+w "$(RELSYSDIR)"
cd asn1_SUITE_data; tar cfh "$(RELSYSDIR)/asn1_SUITE_data.tar" *