mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bugzilla bug: 326699 Added check for libjss4.$platform_lib_extension 

sr=Alexei.Volkov r=Christophe.Ravel
This commit is contained in:
sandeep.konchady%sun.com 2006-02-21 23:27:49 +00:00
Родитель 713e3bd05b
Коммит 40548840b8
1 изменённых файлов: 20 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
security/jss/org/mozilla/jss/tests/all.pl
Просмотреть файл

@ -58,15 +58,16 @@ my $testrun = 0;
my $testpass = 0;
my $nss_lib_dir;
my $dist_dir;
my $pathsep = ":";
my $scriptext = "sh";
my $exe_suffix = "";
my $lib_suffix = ".so";
my $lib_jss = "libjss";
my $jss_rel_dir = "";
my $jss_classpath = "";
my $pathsep = ":";
my $scriptext = "sh";
my $exe_suffix = "";
my $lib_suffix = ".so";
my $lib_jss = "libjss";
my $jss_rel_dir = "";
my $jss_classpath = "";
my $portJSSEServer = 2876;
my $portJSSServer = 2877;
my $portJSSServer = 2877;
my $hostname = localhost;
sub setup_vars {
my $argv = shift;
@ -77,6 +78,7 @@ sub setup_vars {
if( $osname =~ /HP/ ) {
$ld_lib_path = "SHLIB_PATH";
$scriptext = "sh";
$lib_suffix = ".sl";
} elsif( $osname =~ /win/i ) {
$ld_lib_path = "PATH";
$truncate_lib_path = 0;
@ -377,7 +379,7 @@ $result and print "JSSE servers returned $result\n";
# Test JSS client communication
#
print "============= Start JSS client tests\n";
$result = system("$java org.mozilla.jss.tests.JSS_SSLClient $testdir $pwfile $portJSSEServer bypassOff");
$result = system("$java org.mozilla.jss.tests.JSS_SSLClient $testdir $pwfile $hostname $portJSSEServer bypassOff");
$result >>=8;
$result and print "JSS client returned $result\n";
print_case_result ($result,"JSSE server / JSS client");
@ -451,7 +453,7 @@ $result and print "JSSE servers testing JSS client in bypassPKCS11 test returned
# Test JSS in bypassPKCS11 mode client communication
#
print "============= Start JSS client tests in bypassPKCS11 mode\n";
$result = system("$java org.mozilla.jss.tests.JSS_SSLClient $testdir $pwfile $portJSSEServer bypass");
$result = system("$java org.mozilla.jss.tests.JSS_SSLClient $testdir $pwfile $hostname $portJSSEServer bypass");
$result >>=8;
$result and print "JSS client in bypassPKCS11 mode returned $result\n";
print_case_result ($result,"JSSE server / JSS client in bypassPKCS11 mode");
@ -485,11 +487,17 @@ my $LIB = "$lib_jss"."4"."$lib_suffix";
my $strings_exist = `which strings`;
chomp($strings_exist);
if ($strings_exist ne "") {
(-f "$nss_lib_dir/$LIB") or die "$nss_lib_dir/$LIB does not exist\n";
my $jsslibver = `strings $nss_lib_dir/$LIB | grep Header`;
chomp($jsslibver);
print "$LIB = $jsslibver\n";
if ($jsslibver ne "") {
print "$LIB = $jsslibver\n";
} else {
print "Could not fetch Header information from $nss_lib_dir/$LIB\n";
}
} else {
print "Could not fetch Header information from $LIB\n";
print "Could not fetch Header information from $nss_lib_dir/$LIB\n";
$result=1;
}
$result and print "JSS jar package information test returned $result\n";
print_case_result ($result,"Check JSS jar version");