Ticket #3751: 3751-0006-extfs-rpm-use-PERL-instead-of-perl-for-tests.patch

File 3751-0006-extfs-rpm-use-PERL-instead-of-perl-for-tests.patch, 2.8 KB (added by mooffie, 8 years ago)

  • configure.ac 

    From e9ef8f32c2cf637f6f151a837753887f8a3fabfa Mon Sep 17 00:00:00 2001
From: Mooffie <mooffie@gmail.com>
Date: Fri, 6 Jan 2017 01:23:42 +0200
Subject: [PATCH 2/3] Ticket #3751: extfs: rpm: use @PERL@ instead of perl for
 tests.

Signed-off-by: Mooffie <mooffie@gmail.com>
---
 configure.ac                                         | 1 +
 src/vfs/extfs/helpers/Makefile.am                    | 4 +++-
 src/vfs/extfs/helpers/{rpm => rpm.in}                | 1 +
 tests/src/vfs/extfs/helpers-list/data/rpm.rewrite.sh | 4 ++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename src/vfs/extfs/helpers/{rpm => rpm.in} (99%)
 mode change 100755 => 100644

diff --git a/configure.ac b/configure.ac
index c128c09..893beca 100644
    a b src/vfs/extfs/helpers/hp48+ 
    554554src/vfs/extfs/helpers/lslR 
    555555src/vfs/extfs/helpers/mailfs 
    556556src/vfs/extfs/helpers/patchfs 
     557src/vfs/extfs/helpers/rpm 
    557558src/vfs/extfs/helpers/rpms+ 
    558559src/vfs/extfs/helpers/s3+ 
    559560src/vfs/extfs/helpers/uace 

  • src/vfs/extfs/helpers/Makefile.am 

    diff --git a/src/vfs/extfs/helpers/Makefile.am b/src/vfs/extfs/helpers/Makefile.am
index 06ea789..47954d5 100644
    a b EXTFSCONFFILES = sfs.ini 
    66EXTFS_MISC  = README README.extfs 
    77 
    88# Scripts hat don't need adaptation to the local system 
    9 EXTFS_CONST = bpp changesetfs gitfs+ patchsetfs rpm trpm u7z 
     9EXTFS_CONST = bpp changesetfs gitfs+ patchsetfs trpm u7z 
    1010 
    1111# Scripts that need adaptation to the local system - source files 
    1212EXTFS_IN    =                   \ 
    … … EXTFS_IN = \ 
    2222        lslR.in                 \ 
    2323        mailfs.in               \ 
    2424        patchfs.in              \ 
     25        rpm.in                  \ 
    2526        rpms+.in                \ 
    2627        s3+.in                  \ 
    2728        uace.in                 \ 
    … … EXTFS_OUT = \ 
    5253        lslR                    \ 
    5354        mailfs                  \ 
    5455        patchfs                 \ 
     56        rpm                     \ 
    5557        rpms+                   \ 
    5658        s3+                     \ 
    5759        uace                    \ 

  • (a) a/src/vfs/extfs/helpers/rpm vs. (b) b/src/vfs/extfs/helpers/rpm.in 

    diff --git a/src/vfs/extfs/helpers/rpm b/src/vfs/extfs/helpers/rpm.in
old mode 100755
new mode 100644
similarity index 99%
rename from src/vfs/extfs/helpers/rpm
rename to src/vfs/extfs/helpers/rpm.in
index 30d6926..c131dfc
    a b mcrpmfs_run () 
    329329} 
    330330 
    331331# Let the test framework override functions and variables. 
     332PERL=@PERL@ 
    332333[ -n "$MC_TEST_RPM_REWRITE" ] && . "$MC_TEST_RPM_REWRITE" 
    333334 
    334335AllTAGS=`mcrpmfs_getAllNeededTags "$1"` 

  • tests/src/vfs/extfs/helpers-list/data/rpm.rewrite.sh 

    diff --git a/tests/src/vfs/extfs/helpers-list/data/rpm.rewrite.sh b/tests/src/vfs/extfs/helpers-list/data/rpm.rewrite.sh
index a6c4932..5552057 100644
    a b TAGSF="$MC_TEST_INPUT" 
    1818# 
    1919mcrpmfs_getSupportedTags() 
    2020{ 
    21   perl -e ' 
     21  $PERL -e ' 
    2222    $tagsf = $ARGV[0]; 
    2323 
    2424    do $tagsf or die("$tagsf: $!"); 
    … … mcrpmfs_getSupportedTags() 
    3939# 
    4040rpm_qf() 
    4141{ 
    42   perl -w -e ' 
     42  $PERL -w -e ' 
    4343    $tagsf = $ARGV[0]; 
    4444    $tmplt = $ARGV[1]; 
    4545