Merge branch 'alind/asn1/parallel-tests' into maint

* alind/asn1/parallel-tests:
  [asn1] Refactor test cases and remove extra suites
  [asn1] Replace 'driver' option with 'nif'
  [asn1] Correct test suite dependencies
  [asn1] Parallelize test suites
  [asn1] Make tables and processes unnamed
  [asn1] Abstract out table access to new module
  [asn1] Run asn1 compilation in a separate process

1 files changed, 4 insertions, 40 deletions

diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile
index 7ecd544d4b..1621abbec9 100644
--- a/lib/asn1/test/Makefile
+++ b/lib/asn1/test/Makefile
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -28,11 +28,10 @@ MODULES= \
 	h323test \
 	choice_extension \
 	ber_decode_error \
-	testExternal \
 	testPrim \
-        testPrimStrings \
+	testPrimStrings \
 	testCompactBitString \
-        testPrimExternal \
+	testPrimExternal \
 	testChoPrim \
 	testChoExtension \
 	testChoExternal \
@@ -86,15 +85,12 @@ MODULES= \
 	testMergeCompile \
 	testDeepTConstr \
 	testTimer \
-	testRANAP \
 	testMegaco \
-	testMvrasn6 \
 	testSeqSetDefaultVal \
 	testParamBasic \
 	testContextSwitchingTypes \
 	testTypeValueNotation \
 	testOpenTypeImplicitTag \
-	testROSE \
 	testINSTANCE_OF \
 	test_partial_incomplete_decode \
 	testDER \
@@ -108,7 +104,6 @@ MODULES= \
 	test_inline \
 	testTcapsystem \
 	testNBAPsystem \
-	test_bad_values \
 	test_compile_options \
 	testDoubleEllipses \
 	test_modified_x420 \
@@ -118,16 +113,9 @@ MODULES= \
 	asn1_app_test \
 	asn1_appup_test \
 	asn1_wrapper \
-	asn1_SUITE \
-	asn1_bin_SUITE \
-	asn1_bin_v2_SUITE
+	asn1_SUITE
 
 SUITE= asn1_SUITE.erl
-SUITE_BIN= asn1_bin_SUITE.erl
-SUITE_BIN_V2= asn1_bin_v2_SUITE.erl
-SUITE_SRC= asn1_SUITE.erl.src
-SUITE_BIN_SRC= asn1_bin_SUITE.erl.src
-SUITE_BIN_V2_SRC= asn1_bin_SUITE.erl.src
 
 ERL_FILES= $(MODULES:%=%.erl)
 
@@ -156,30 +144,10 @@ $(EMAKEFILE): $(ERL_FILES) $(HRL_FILES)
 tests debug opt: $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2) $(EMAKEFILE)
 
 clean:
-	rm -f $(SUITE) $(SUITE_BIN) $(SUITE_BIN_V2)
 	rm -f core
 
 docs:
 
-#-----------------------------------------------------
-# Special Targets
-#-----------------------------------------------------
-$(SUITE): $(SUITE_SRC)
-	sed -e 's;%BIN%;;' -e 's;%PER%;per;' -e 's;%BER%;ber;'  $< > $@
-	cat asn1_common_SUITE.erl.src >> $@
-	cat asn1_particular_SUITE.erl.src >> $@
-
-
-$(SUITE_BIN): $(SUITE_SRC)
-	sed -e 's;%BIN%;bin_;' -e 's;%PER%;per_bin;' -e 's;%BER%;ber_bin;' $< > $@
-	echo "common() -> []." >> $@
-	cat asn1_bin_particular_SUITE.erl.src >> $@
-
-$(SUITE_BIN_V2): $(SUITE_SRC)
-	sed -e 's;%BIN%;bin_v2_;' -e 's;%PER%;per_bin;' -e 's;%BER%;ber_bin_v2;' $< > $@
-	echo "common() -> []." >> $@
-	cat asn1_bin_v2_particular_SUITE.erl.src >> $@
-
 # ----------------------------------------------------
 # Release Target
 # ---------------------------------------------------- 
@@ -190,15 +158,11 @@ release_spec: opt
 release_tests_spec: opt
 	$(INSTALL_DIR) $(RELSYSDIR)
 	$(INSTALL_DIR) $(RELSYSDIR)/asn1_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data
-	$(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_v2_SUITE_data
 	$(INSTALL_DATA)  $(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 *
 	cd $(RELSYSDIR)/asn1_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
-	cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
-	cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar
 	rm $(RELSYSDIR)/asn1_SUITE_data.tar
 
 release_docs_spec: