Commit ea4507ee authored by Ben Laurie's avatar Ben Laurie
Browse files

Fix test_ss.

parent 4b9af0a1

test/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -318,7 +318,8 @@ test_gen: ../apps/openssl testgen test.cnf 
	@sh ./testgen



test_ss keyU.ss certU.ss certCA.ss certP1.ss keyP1.ss certP2.ss keyP2.ss \

		intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf

		intP1.ss intP2.ss: testss CAss.cnf Uss.cnf P1ss.cnf P2ss.cnf \

                                   ../apps/openssl

	@echo "Generate and certify a test certificate"

	@sh ./testss

	@cat certCA.ss certU.ss > intP1.ss

util/pl/unix.pl

+13 −10
Original line number Diff line number Diff line
@@ -320,16 +320,6 @@ sub get_tests 
    {

    next if $t eq '';



    if ($t =~ /^test_ss/)

      {

      $t =~ s/\s+/ \$(TEST_D)\//g;

      $all .= ' test_ss';

      }

    else

      {

      $all .= " $t";

      }



    my $d = $deps{$t};

    $d =~ s/\.\.\/apps/\$(BIN_D)/g;

    $d =~ s/\.\.\/util/\$(TEST_D)/g;
@@ -342,6 +332,18 @@ sub get_tests 
    $r =~ s/\.\.\/(\S+)/\$(SRC_D)\/$1/g;

    $r = fixrules($r);



    next if $r eq '';



    if ($t =~ /^test_ss/)

      {

      $t =~ s/\s+/ \$(TEST_D)\//g;

      $all .= ' test_ss';

      }

    else

      {

      $all .= " $t";

      }



    $each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n";

    }
@@ -376,6 +378,7 @@ sub get_tests 
		 'trsa',

		 'testrsa.pem',

		 'testsid.pem',

		 'testss',

	       );

  my $copies = copy_scripts(1, 'test', @copies);

  $copies .= copy_scripts(0, 'test', ('smcont.txt'));