Commit d6399c85 authored by Matt Caswell's avatar Matt Caswell
Browse files

Fix shlibloadtest to properly execute the dso_ref test 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7983)
parent d7389c82

test/shlibloadtest.c

+3 −9
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static int test_lib(void) 


    switch (test_type) {

    case JUST_CRYPTO:

    case DSO_REFTEST:

        if (!TEST_true(shlib_load(path_crypto, &cryptolib)))

            goto end;

        break;
@@ -130,10 +131,6 @@ static int test_lib(void) 
                || !TEST_true(shlib_load(path_crypto, &cryptolib)))

            goto end;

        break;

    case DSO_REFTEST:

        if (!TEST_true(shlib_load(path_crypto, &cryptolib)))

            goto end;

        break;

    }



    if (test_type != JUST_CRYPTO && test_type != DSO_REFTEST) {
@@ -205,6 +202,7 @@ static int test_lib(void) 


    switch (test_type) {

    case JUST_CRYPTO:

    case DSO_REFTEST:

        if (!TEST_true(shlib_close(cryptolib)))

            goto end;

        break;
@@ -218,10 +216,6 @@ static int test_lib(void) 
                || !TEST_true(shlib_close(cryptolib)))

            goto end;

        break;

    case DSO_REFTEST:

        if (!TEST_true(shlib_close(cryptolib)))

            goto end;

        break;

    }



    result = 1;
@@ -242,7 +236,7 @@ int setup_tests(void) 
    } else if (strcmp(p, "-just_crypto") == 0) {

        test_type = JUST_CRYPTO;

    } else if (strcmp(p, "-dso_ref") == 0) {

        test_type = JUST_CRYPTO;

        test_type = DSO_REFTEST;

    } else {

        TEST_error("Unrecognised argument");

        return 0;