svn commit: r1854354 - in /spamassassin: branches/3.4/t/make_install.t trunk/t/make_install.t

[gb...@apache.org]

Author: gbechis
Date: Tue Feb 26 07:39:34 2019
New Revision: 1854354

URL: http://svn.apache.org/viewvc?rev=1854354&view=rev
Log:
fix make_install regression test on *BSD,
still passes on Linux

Modified:
    spamassassin/branches/3.4/t/make_install.t
    spamassassin/trunk/t/make_install.t

Modified: spamassassin/branches/3.4/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/make_install.t?rev=1854354&r1=1854353&r2=1854354&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/make_install.t (original)
+++ spamassassin/branches/3.4/t/make_install.t Tue Feb 26 07:39:34 2019
@@ -38,6 +38,8 @@ system_or_die "cd $builddir && mv Mail-S
 my $binpath = $Config{sitebinexp};
 $binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
 
+my $installarchlib = $Config{installarchlib};
+
 #Fix for RH/Fedora using lib64 instead of lib - bug 6609
 $x64_bit_lib_test = 0;
 if (-e '/bin/rpm') {
@@ -99,6 +101,8 @@ ok -d "$prefix/$binpath";
 if ($x64_bit_lib_test) {
   #print "testing for $prefix/lib64";
   ok -d "$prefix/lib64";
+} elsif ( $installarchlib =~ '/libdata/' ) {
+  ok -d "$prefix/libdata";
 } else {
   ok -d "$prefix/lib";
 }
@@ -156,6 +160,8 @@ ok -d "$prefix/$binpath";
 ok -d "$prefix/etc/mail/spamassassin";
 if ($x64_bit_lib_test) {
   ok -d "$prefix/lib64";
+} elsif ( $installarchlib =~ '/libdata/' ) {
+  ok -d "$prefix/libdata";
 } else {
   ok -d "$prefix/lib";
 }

Modified: spamassassin/trunk/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/make_install.t?rev=1854354&r1=1854353&r2=1854354&view=diff
==============================================================================
--- spamassassin/trunk/t/make_install.t (original)
+++ spamassassin/trunk/t/make_install.t Tue Feb 26 07:39:34 2019
@@ -38,6 +38,8 @@ system_or_die "cd $builddir && mv Mail-S
 my $binpath = $Config{sitebinexp};
 $binpath =~ s|^\Q$Config{siteprefixexp}\E/||;
 
+my $installarchlib = $Config{installarchlib};
+
 #Fix for RH/Fedora using lib64 instead of lib - bug 6609
 $x64_bit_lib_test = 0;
 if (-e '/bin/rpm') {
@@ -99,6 +101,8 @@ ok -d "$prefix/$binpath";
 if ($x64_bit_lib_test) {
   #print "testing for $prefix/lib64";
   ok -d "$prefix/lib64";
+} elsif ( $installarchlib =~ '/libdata/' ) {
+  ok -d "$prefix/libdata";
 } else {
   ok -d "$prefix/lib";
 }
@@ -156,6 +160,8 @@ ok -d "$prefix/$binpath";
 ok -d "$prefix/etc/mail/spamassassin";
 if ($x64_bit_lib_test) {
   ok -d "$prefix/lib64";
+} elsif ( $installarchlib =~ '/libdata/' ) {
+  ok -d "$prefix/libdata";
 } else {
   ok -d "$prefix/lib";
 }