[SCM] GNU libtasn1 branch, master, updated. libtasn1_3_6-25-g2111c27

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libtasn1".

http://git.savannah.gnu.org/cgit/libtasn1.git/commit/?id=2111c27daadaa52b146432c37e8750c4b4e2ca6b

The branch, master has been updated
       via  2111c27daadaa52b146432c37e8750c4b4e2ca6b (commit)
      from  37762160fe2c6580a24f52cd223e6d166e31f25e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2111c27daadaa52b146432c37e8750c4b4e2ca6b
Author: Alon Bar-Lev <address@hidden>
Date:   Sat Jun 7 21:48:50 2014 +0300

    build: tests: fix Test_choice within separate builddir
    
    Signed-off-by: Alon Bar-Lev <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.am   |    2 +-
 tests/Test_choice.c |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6c850a..4762a69 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ TESTS = Test_parser Test_tree Test_encoding Test_indefinite   
\
 TESTS_ENVIRONMENT = \
        ASN1PARSER=$(srcdir)/Test_parser.asn \
        ASN1TREE=$(srcdir)/Test_tree.asn \
-       ASN1PKIX=$(srcdir)/pkix.asn \
+       ASN1CHOICE=$(srcdir)/choice.asn \
        ASN1PKIX=$(srcdir)/pkix.asn \
        ASN1CRLDER=$(srcdir)/crl.der \
        ASN1INDEF=$(srcdir)/TestIndef.p12 \
diff --git a/tests/Test_choice.c b/tests/Test_choice.c
index 07da57e..8a0b5c1 100644
--- a/tests/Test_choice.c
+++ b/tests/Test_choice.c
@@ -8,12 +8,16 @@ main (int argc, char** argv)
   int result = 0;
   asn1_node definitions = NULL, node1 = NULL, node2 = NULL;
   char errorDescription[ASN1_MAX_ERROR_DESCRIPTION_SIZE];
+  const char *choicefile = getenv ("ASN1CHOICE");
 
   char data[1024];
   int data_size = sizeof (data);
 
+  if (!choicefile)
+    choicefile = "choice.asn";
+
   /* Encode */
-  result = asn1_parser2tree ("choice.asn", &definitions, errorDescription);
+  result = asn1_parser2tree (choicefile, &definitions, errorDescription);
   if (result != ASN1_SUCCESS)
     {
       printf ("error in %d\n", __LINE__);


hooks/post-receive
-- 
GNU libtasn1