svn commit: r1129411 - /spamassassin/branches/3.3/t/make_install.t

[wt...@apache.org]

Author: wtogami
Date: Mon May 30 22:33:37 2011
New Revision: 1129411

URL: http://svn.apache.org/viewvc?rev=1129411&view=rev
Log:
Bug #6609: Fix for RH/Fedora using lib64 instead of lib
           (The original test was broken, it was working fine.)

Modified:
    spamassassin/branches/3.3/t/make_install.t

Modified: spamassassin/branches/3.3/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/t/make_install.t?rev=1129411&r1=1129410&r2=1129411&view=diff
==============================================================================
--- spamassassin/branches/3.3/t/make_install.t (original)
+++ spamassassin/branches/3.3/t/make_install.t Mon May 30 22:33:37 2011
@@ -14,6 +14,7 @@ BEGIN { 
   if (-e 'test_dir') {
     unshift(@INC, '../blib/lib');
   }
+
 };
 
 # -------------------------------------------------------------------
@@ -30,6 +31,28 @@ system_or_die "cd .. && make tardist";
 system_or_die "cd $builddir && gunzip -cd $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf -";
 system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
 
+#Fix for RH/Fedora using lib64 instead of lib - bug 6609
+$x64_bit_lib_test = 0;
+if (-e '/bin/rpm') {
+  $command = '/bin/rpm --showrc';
+
+  @output = `$command`;
+
+  foreach $output (@output) {
+    if ($output =~ /-\d+: _lib(dir)?\t(.*)$/) {
+      if ($2 && $2 =~ /64/) {
+        $x64_bit_lib_test++;
+      }
+    }
+  }
+}
+
+if ($x64_bit_lib_test) {
+  print "\nEnabling checks for 64 bit lib directories.\n";
+} else {
+  print "\nDisabling checks for 64 bit lib directories.\n";
+}
+
 sub new_instdir {
   $instdir = $instbase.".".(shift);
   print "\nsetting new instdir: $instdir\n";
@@ -49,7 +72,12 @@ new_instdir(__LINE__);
 run_makefile_pl "PREFIX=$instdir/foo";
 
 ok -d "$instdir/foo/bin";
-ok -d "$instdir/foo/lib";
+if ($x64_bit_lib_test) {
+  ok -d "$instdir/foo/lib64";
+} else {
+  ok -d "$instdir/foo/lib";
+}
+
 ok -e "$instdir/foo/share/spamassassin";
 ok -e "$instdir/foo/etc/mail/spamassassin";
 
@@ -94,8 +122,12 @@ ok !-e "$instdir/foo/etc/mail/spamassass
 new_instdir(__LINE__);
 run_makefile_pl "DESTDIR=$instdir/dest PREFIX=/foo";
 
-ok -e "$instdir/dest/foo/bin";
-ok -e "$instdir/dest/foo/etc/mail/spamassassin";
-ok -e "$instdir/dest/foo/lib";
+ok -d "$instdir/dest/foo/bin";
+ok -d "$instdir/dest/foo/etc/mail/spamassassin";
+if ($x64_bit_lib_test) {
+  ok -d "$instdir/dest/foo/lib64";
+} else {
+  ok -d "$instdir/dest/foo/lib";
+}
 ok -e "$instdir/dest/foo/share/spamassassin/sa-update-pubkey.txt";