Commit df5228e3 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/7647)
parent 9c5ef4ea

test/shlibloadtest.c

+3 −9
Original line number Diff line number Diff line
@@ -121,6 +121,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;
@@ -134,10 +135,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) {
@@ -210,6 +207,7 @@ static int test_lib(void) 


    switch (test_type) {

    case JUST_CRYPTO:

    case DSO_REFTEST:

        if (!TEST_true(shlib_close(cryptolib)))

            goto end;

        break;
@@ -223,10 +221,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;
@@ -247,7 +241,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;