Compare commits
No commits in common. "rawhide" and "f35" have entirely different histories.
14 changed files with 367 additions and 127 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -3,5 +3,3 @@ which-2.18.tar.gz
|
|||
which-2.19.tar.gz
|
||||
/which-2.20.tar.gz
|
||||
/which-2.21.tar.gz
|
||||
/which-2.22.tar.gz
|
||||
/which-2.23.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
summary: Basic smoke test
|
||||
discover:
|
||||
how: fmf
|
||||
execute:
|
||||
how: tmt
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (which-2.23.tar.gz) = 738807f79e8cfc5967541a28ae7021247c04c4177279f09be2c19c069af450a7e3b19baf9079fe5569b25b4630bb400be242a123647e52c9fe54f0ad007317bf
|
||||
097ff1a324ae02e0a3b0369f07a7544a which-2.21.tar.gz
|
||||
|
|
|
|||
261
tests/artifacts/test.basic-functionality-test.log
Normal file
261
tests/artifacts/test.basic-functionality-test.log
Normal file
|
|
@ -0,0 +1,261 @@
|
|||
posix on
|
||||
:: [ 12:25:31 ] :: [ WARNING ] :: POSIX mode detected and switched off
|
||||
:: [ 12:25:31 ] :: [ WARNING ] :: POSIX mode detected and switched off
|
||||
:: [ 12:25:31 ] :: [ WARNING ] :: Please fix your test to have /bin/bash shebang
|
||||
:: [ 12:25:31 ] :: [ WARNING ] :: Please fix your test to have /bin/bash shebang
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: Setup
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
which-2.21-4.fc27.x86_64
|
||||
:: [ PASS ] :: Checking for the presence of which rpm
|
||||
:: [ 12:25:31 ] :: Package versions:
|
||||
:: [ 12:25:31 ] :: Package versions:
|
||||
:: [ 12:25:31 ] :: which-2.21-4.fc27.x86_64
|
||||
:: [ 12:25:31 ] :: which-2.21-4.fc27.x86_64
|
||||
:: [ BEGIN ] :: Creating tmp directory :: actually running 'TmpDir=$(mktemp -d)'
|
||||
:: [ BEGIN ] :: Creating tmp directory :: actually running 'TmpDir=$(mktemp -d)'
|
||||
:: [ PASS ] :: Creating tmp directory (Expected 0, got 0)
|
||||
:: [ BEGIN ] :: Running 'pushd /tmp/tmp.cVaYqMMJWL'
|
||||
:: [ BEGIN ] :: Running 'pushd /tmp/tmp.cVaYqMMJWL'
|
||||
/tmp/tmp.cVaYqMMJWL /usr/local/bin/basic-functionality-test
|
||||
:: [ PASS ] :: Command 'pushd /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0)
|
||||
:: [ BEGIN ] :: Running 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL'
|
||||
:: [ BEGIN ] :: Running 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL'
|
||||
:: [ PASS ] :: Command 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0)
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test --version
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'VERSION=$( rpm -q --qf '%{VERSION}' which )'
|
||||
:: [ BEGIN ] :: Running 'VERSION=$( rpm -q --qf '%{VERSION}' which )'
|
||||
:: [ PASS ] :: Command 'VERSION=$( rpm -q --qf '%{VERSION}' which )' (Expected 0, got 0)
|
||||
:: [ BEGIN ] :: Running 'which --version'
|
||||
:: [ BEGIN ] :: Running 'which --version'
|
||||
GNU which v2.21, Copyright (C) 1999 - 2015 Carlo Wood.
|
||||
GNU which comes with ABSOLUTELY NO WARRANTY;
|
||||
This program is free software; your freedom to use, change
|
||||
and distribute this program is protected by the GPL.
|
||||
:: [ PASS ] :: Command 'which --version' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.0WBy8LPp' should contain 'GNU which v2.21'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test locating the bash binary
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'which bash'
|
||||
:: [ BEGIN ] :: Running 'which bash'
|
||||
/bin/bash
|
||||
:: [ PASS ] :: Command 'which bash' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.eBwKSEjp' should contain '/bin/bash'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test an alias
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'echo 'alias foo=bar' > bashrc'
|
||||
:: [ BEGIN ] :: Running 'echo 'alias foo=bar' > bashrc'
|
||||
:: [ PASS ] :: Command 'echo 'alias foo=bar' > bashrc' (Expected 0, got 0)
|
||||
:: [ BEGIN ] :: Running 'echo -e 'alias foo=true
|
||||
which foo' | bash -i'
|
||||
:: [ BEGIN ] :: Running 'echo -e 'alias foo=true
|
||||
which foo' | bash -i'
|
||||
[1;31m[root@localhost tmp.cVaYqMMJWL]#[0m alias foo=true
|
||||
[1;31m[root@localhost tmp.cVaYqMMJWL]#[0m which foo
|
||||
]0;root@localhost:/tmp/tmp.cVaYqMMJWL]0;root@localhost:/tmp/tmp.cVaYqMMJWLalias foo='true'
|
||||
/bin/true
|
||||
[1;31m[root@localhost tmp.cVaYqMMJWL]#[0m exit
|
||||
]0;root@localhost:/tmp/tmp.cVaYqMMJWL:: [ PASS ] :: Command 'echo -e 'alias foo=true\nwhich foo' | bash -i' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain 'alias foo='true''
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain '/bin/true'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test non existing command
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'which foobar'
|
||||
:: [ BEGIN ] :: Running 'which foobar'
|
||||
which: no foobar in (/sbin:/bin:/usr/sbin:/usr/bin)
|
||||
:: [ PASS ] :: Command 'which foobar' (Expected 1, got 1)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.qmmfZVfo' should contain 'no foobar in (/sbin:/bin:/usr/sbin:/usr/bin)'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test with customized PATH
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true''
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true''
|
||||
/tmp/tmp.cVaYqMMJWL/true
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.1ondAtov' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test options -a / --all
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true''
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true''
|
||||
/tmp/tmp.cVaYqMMJWL/true
|
||||
/bin/true
|
||||
/usr/bin/true
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/bin/true'
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true''
|
||||
:: [ BEGIN ] :: Running 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true''
|
||||
/tmp/tmp.cVaYqMMJWL/true
|
||||
/bin/true
|
||||
/usr/bin/true
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/bin/true'
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: Cleanup
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ BEGIN ] :: Running 'popd'
|
||||
:: [ BEGIN ] :: Running 'popd'
|
||||
/usr/local/bin/basic-functionality-test
|
||||
:: [ PASS ] :: Command 'popd' (Expected 0, got 0)
|
||||
:: [ BEGIN ] :: Removing tmp directory :: actually running 'rm -r /tmp/tmp.cVaYqMMJWL'
|
||||
:: [ BEGIN ] :: Removing tmp directory :: actually running 'rm -r /tmp/tmp.cVaYqMMJWL'
|
||||
:: [ PASS ] :: Removing tmp directory (Expected 0, got 0)
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: TEST PROTOCOL
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ LOG ] :: Package : unknown
|
||||
:: [ LOG ] :: Installed : which-2.21-4.fc27.x86_64
|
||||
:: [ LOG ] :: beakerlib RPM : beakerlib-1.16-4.fc27
|
||||
:: [ LOG ] :: bl-redhat RPM : not installed
|
||||
:: [ LOG ] :: Test started : 2017-12-11 12:25:31 EET
|
||||
:: [ LOG ] :: Test finished : 2017-12-11 12:25:34 EET
|
||||
:: [ LOG ] :: Test name : basic-functionality-test
|
||||
:: [ LOG ] :: Distro : Fedora release 27 (Twenty Seven)
|
||||
:: [ LOG ] :: Hostname : localhost.localdomain
|
||||
:: [ LOG ] :: Architecture : x86_64
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: Test description
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
PURPOSE of /CoreOS/which/Sanity/basic-functionality-test
|
||||
Description: tests basic functionality
|
||||
Author: Karel Srot <ksrot@redhat.com>
|
||||
|
||||
tests following scenarios:
|
||||
* test --version
|
||||
* test locating the bash binary
|
||||
* test an alias
|
||||
* test non existing command
|
||||
* test with customized PATH
|
||||
* test options -a / --all
|
||||
|
||||
:: [ WARNING ] :: POSIX mode detected and switched off
|
||||
:: [ WARNING ] :: Please fix your test to have /bin/bash shebang
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: Setup
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Checking for the presence of which rpm
|
||||
:: [ LOG ] :: Package versions:
|
||||
:: [ LOG ] :: which-2.21-4.fc27.x86_64
|
||||
:: [ PASS ] :: Creating tmp directory (Expected 0, got 0)
|
||||
:: [ PASS ] :: Command 'pushd /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0)
|
||||
:: [ PASS ] :: Command 'cp -p /bin/true /tmp/tmp.cVaYqMMJWL' (Expected 0, got 0)
|
||||
:: [ LOG ] :: Duration: 1s
|
||||
:: [ LOG ] :: Assertions: 4 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: Setup
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test --version
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'VERSION=$( rpm -q --qf '%{VERSION}' which )' (Expected 0, got 0)
|
||||
:: [ PASS ] :: Command 'which --version' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.0WBy8LPp' should contain 'GNU which v2.21'
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 3 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test --version
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test locating the bash binary
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'which bash' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.eBwKSEjp' should contain '/bin/bash'
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 2 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test locating the bash binary
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test an alias
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'echo 'alias foo=bar' > bashrc' (Expected 0, got 0)
|
||||
:: [ PASS ] :: Command 'echo -e 'alias foo=true\nwhich foo' | bash -i' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain 'alias foo='true''
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.W7TNYyLv' should contain '/bin/true'
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 4 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test an alias
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test non existing command
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'which foobar' (Expected 1, got 1)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.qmmfZVfo' should contain 'no foobar in (/sbin:/bin:/usr/sbin:/usr/bin)'
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 2 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test non existing command
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test with customized PATH
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.1ondAtov' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 2 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test with customized PATH
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: test options -a / --all
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which -a true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.9pOxwvyK' should contain '/bin/true'
|
||||
:: [ PASS ] :: Command 'bash -c 'export PATH=/tmp/tmp.cVaYqMMJWL:/sbin:/bin:/usr/sbin:/usr/bin; which --all true'' (Expected 0, got 0)
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/tmp/tmp.cVaYqMMJWL/true'
|
||||
:: [ PASS ] :: File '/var/tmp/rlRun_LOG.SMe8bSin' should contain '/bin/true'
|
||||
:: [ LOG ] :: Duration: 1s
|
||||
:: [ LOG ] :: Assertions: 6 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: test options -a / --all
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: Cleanup
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ PASS ] :: Command 'popd' (Expected 0, got 0)
|
||||
:: [ PASS ] :: Removing tmp directory (Expected 0, got 0)
|
||||
:: [ LOG ] :: Duration: 0s
|
||||
:: [ LOG ] :: Assertions: 2 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: Cleanup
|
||||
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: [ LOG ] :: basic-functionality-test
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
|
||||
:: [ LOG ] :: Phases: 8 good, 0 bad
|
||||
:: [ PASS ] :: RESULT: basic-functionality-test
|
||||
:: [ 12:25:34 ] :: JOURNAL XML: /var/tmp/beakerlib-3xyUzEH/journal.xml
|
||||
:: [ 12:25:34 ] :: JOURNAL XML: /var/tmp/beakerlib-3xyUzEH/journal.xml
|
||||
:: [ 12:25:34 ] :: JOURNAL TXT: /var/tmp/beakerlib-3xyUzEH/journal.txt
|
||||
:: [ 12:25:34 ] :: JOURNAL TXT: /var/tmp/beakerlib-3xyUzEH/journal.txt
|
||||
1
tests/artifacts/test.log
Normal file
1
tests/artifacts/test.log
Normal file
|
|
@ -0,0 +1 @@
|
|||
PASS basic-functionality-test
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
summary: tests basic functionality
|
||||
description: "tests following scenarios:\n * test --version\n * test locating the
|
||||
bash binary\n * test an alias\n * test non existing command\n * test with customized
|
||||
PATH\n * test options -a / --all\n"
|
||||
contact: Karel Srot <ksrot@redhat.com>
|
||||
component:
|
||||
- which
|
||||
test: ./runtest.sh
|
||||
framework: beakerlib
|
||||
recommend:
|
||||
- which
|
||||
duration: 5m
|
||||
extra-summary: /CoreOS/which/Sanity/basic-functionality-test
|
||||
extra-task: /CoreOS/which/Sanity/basic-functionality-test
|
||||
|
|
@ -27,6 +27,7 @@
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
# Include Beaker environment
|
||||
. /usr/bin/rhts-environment.sh || exit 1
|
||||
. /usr/share/beakerlib/beakerlib.sh || exit 1
|
||||
|
||||
PACKAGE="which"
|
||||
|
|
|
|||
1
tests/tests.retry
Normal file
1
tests/tests.retry
Normal file
|
|
@ -0,0 +1 @@
|
|||
localhost
|
||||
13
tests/tests.yml
Normal file
13
tests/tests.yml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
---
|
||||
# Run tests in all contexts
|
||||
- hosts: localhost
|
||||
tags:
|
||||
- classic
|
||||
- container
|
||||
- atomic
|
||||
roles:
|
||||
- role: standard-test-beakerlib
|
||||
tests:
|
||||
- basic-functionality-test
|
||||
required_packages:
|
||||
- which
|
||||
65
which-2.21-coverity-fixes.patch
Normal file
65
which-2.21-coverity-fixes.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
diff -up which-2.21/tilde/tilde.c.coverity which-2.21/tilde/tilde.c
|
||||
--- which-2.21/tilde/tilde.c.coverity 2008-01-16 18:51:57.000000000 +0100
|
||||
+++ which-2.21/tilde/tilde.c 2021-03-21 11:43:00.338160051 +0100
|
||||
@@ -193,10 +193,10 @@ tilde_expand (string)
|
||||
const char *string;
|
||||
{
|
||||
char *result;
|
||||
- int result_size, result_index;
|
||||
+ int result_size = 0, result_index = 0;
|
||||
|
||||
- result_index = result_size = 0;
|
||||
- if (result = strchr (string, '~'))
|
||||
+ result = strchr (string, '~');
|
||||
+ if (result)
|
||||
result = (char *)xmalloc (result_size = (strlen (string) + 16));
|
||||
else
|
||||
result = (char *)xmalloc (result_size = (strlen (string) + 1));
|
||||
@@ -270,7 +270,7 @@ isolate_tilde_prefix (fname, lenp)
|
||||
char *ret;
|
||||
int i;
|
||||
|
||||
- ret = (char *)xmalloc (strlen (fname));
|
||||
+ ret = (char *)xmalloc (strlen (fname) + 1);
|
||||
#if defined (__MSDOS__)
|
||||
for (i = 1; fname[i] && fname[i] != '/' && fname[i] != '\\'; i++)
|
||||
#else
|
||||
diff -up which-2.21/which.c.coverity which-2.21/which.c
|
||||
--- which-2.21/which.c.coverity 2015-03-19 17:50:24.000000000 +0100
|
||||
+++ which-2.21/which.c 2021-03-21 12:19:31.289160885 +0100
|
||||
@@ -76,16 +76,16 @@ static int skip_functions = 0, read_func
|
||||
|
||||
static char *find_command_in_path(const char *name, const char *path_list, int *path_index)
|
||||
{
|
||||
- char *found = NULL, *full_path;
|
||||
+ char *found = NULL, *full_path = NULL;
|
||||
int status, name_len;
|
||||
|
||||
name_len = strlen(name);
|
||||
+ char *p;
|
||||
|
||||
if (!absolute_program(name))
|
||||
absolute_path_given = 0;
|
||||
else
|
||||
{
|
||||
- char *p;
|
||||
absolute_path_given = 1;
|
||||
|
||||
if (abs_path)
|
||||
@@ -159,6 +159,7 @@ static char *find_command_in_path(const
|
||||
free(full_path);
|
||||
}
|
||||
|
||||
+ name = NULL; p = NULL; path_list = NULL;
|
||||
return (found);
|
||||
}
|
||||
|
||||
@@ -540,7 +541,7 @@ int main(int argc, char *argv[])
|
||||
int function_start_type = 0;
|
||||
if (read_alias || read_functions)
|
||||
{
|
||||
- char buf[1024];
|
||||
+ char buf[1024] = {};
|
||||
int processing_aliases = read_alias;
|
||||
|
||||
if (isatty(0))
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff -up which-2.22/tilde.c.me which-2.22/tilde.c
|
||||
--- which-2.22/tilde.c.me 2025-01-27 10:30:39.731725763 +0100
|
||||
+++ which-2.22/tilde.c 2025-01-27 10:32:11.158379146 +0100
|
||||
@@ -189,7 +189,8 @@ char *tilde_expand(const char *string)
|
||||
int result_size, result_index;
|
||||
|
||||
result_index = result_size = 0;
|
||||
- if (result = strchr(string, '~'))
|
||||
+ result = strchr(string, '~');
|
||||
+ if (result)
|
||||
result = (char *) xmalloc(result_size = (strlen(string) + 16));
|
||||
else
|
||||
result = (char *) xmalloc(result_size = (strlen(string) + 1));
|
||||
86
which.spec
86
which.spec
|
|
@ -1,18 +1,16 @@
|
|||
%global has_which2_alias 1
|
||||
|
||||
Summary: Displays where a particular program in your path is located
|
||||
Name: which
|
||||
Version: 2.23
|
||||
Release: 3%{?dist}
|
||||
License: GPL-3.0-only
|
||||
Version: 2.21
|
||||
Release: 27%{?dist}
|
||||
License: GPLv3
|
||||
Source0: http://ftp.gnu.org/gnu/which/%{name}-%{version}.tar.gz
|
||||
Source1: which2.sh
|
||||
Source2: which2.csh
|
||||
Patch0: which-2.21-warning.patch
|
||||
Patch0: which-2.21-coverity-fixes.patch
|
||||
Url: https://savannah.gnu.org/projects/which/
|
||||
Requires: coreutils
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc gcc-c++
|
||||
BuildRequires: gcc
|
||||
BuildRequires: readline-devel
|
||||
|
||||
%description
|
||||
|
|
@ -20,8 +18,9 @@ The which command shows the full pathname of a specified program, if
|
|||
the specified program is in your PATH.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1 -b .coverity
|
||||
|
||||
%build
|
||||
%configure
|
||||
%make_build
|
||||
|
|
@ -30,85 +29,18 @@ the specified program is in your PATH.
|
|||
%make_install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
|
||||
%if %{has_which2_alias}
|
||||
install -p -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
|
||||
%endif
|
||||
install -p -m 644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc EXAMPLES README AUTHORS NEWS
|
||||
%if %{has_which2_alias}
|
||||
%attr(0644,root,root) %{_sysconfdir}/profile.d/which2.*
|
||||
%endif
|
||||
%{_bindir}/which
|
||||
%{_infodir}/which.info*
|
||||
%{_mandir}/man1/which.1*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.23-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jun 18 2025 Than Ngo <than@redhat.com> - 2.23-2
|
||||
- Add a check to ensure that /proc/$$/exe can be read
|
||||
|
||||
* Mon Feb 03 2025 Than Ngo <than@redhat.com> - 2.23-1
|
||||
- Fixed rhbz#2343361, update to 2.23
|
||||
|
||||
* Sat Feb 01 2025 Than Ngo <than@redhat.com> - 2.22-2
|
||||
- Fixed rhbz#2343113, regression
|
||||
|
||||
* Mon Jan 27 2025 Than Ngo <than@redhat.com> - 2.22-1
|
||||
- Fixed rhbz#2342020, update to 2.22
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-40
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Mar 08 2023 Than Ngo <than@redhat.com> - 2.21-39
|
||||
- fixed #2175953, enable which2 alias
|
||||
|
||||
* Sun Feb 19 2023 Than Ngo <than@redhat.com> - 2.21-38
|
||||
- migrated to SPDX license
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Nov 07 2022 Than Ngo <than@redhat.com> - 2.21-36
|
||||
- which fails for long path
|
||||
|
||||
* Fri Aug 05 2022 Than Ngo <than@redhat.com> - 2.21-35
|
||||
- disable which2 alias and function by default as it caused more problems than benefits
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Feb 09 2022 Than Ngo <than@redhat.com> - 2.21-33
|
||||
- make which2.sh script more robust,
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-32
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Dec 02 2021 Than Ngo <than@redhat.com> - 2.21-31
|
||||
- check shell correctly
|
||||
|
||||
* Tue Oct 26 2021 Than Ngo <than@redhat.com> - 2.21-30
|
||||
- disable the --read-functions option in korn shells
|
||||
|
||||
* Fri Oct 15 2021 Than Ngo <than@redhat.com> - 2.21-29
|
||||
- Fixed regression, use export instead alias
|
||||
|
||||
* Sun Oct 10 2021 Than Ngo <than@redhat.com> - 2.21-28
|
||||
- Resolves: #2009547, which treats function contents as aliases when parsing ksh
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.21-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
29
which2.sh
29
which2.sh
|
|
@ -1,18 +1,19 @@
|
|||
# shellcheck shell=sh
|
||||
# Initialization script for bash, sh, mksh and ksh
|
||||
|
||||
if [ -r /proc/$$/exe ]; then
|
||||
SHELLNAME=$(basename $(readlink /proc/$$/exe))
|
||||
else
|
||||
SHELLNAME="unknown"
|
||||
which_declare="declare -f"
|
||||
which_opt="-f"
|
||||
which_shell="$(cat /proc/$$/comm)"
|
||||
|
||||
if [ "$which_shell" = "ksh" ] || [ "$which_shell" = "mksh" ] || [ "$which_shell" = "zsh" ] ; then
|
||||
which_declare="typeset -f"
|
||||
which_opt=""
|
||||
fi
|
||||
case "$SHELLNAME" in
|
||||
*ksh*|zsh)
|
||||
alias which='alias | /usr/bin/which --tty-only --read-alias --show-tilde --show-dot'
|
||||
;;
|
||||
bash|sh)
|
||||
alias which='(alias; declare -f) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot'
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
which ()
|
||||
{
|
||||
(alias; eval ${which_declare}) | /usr/bin/which --tty-only --read-alias --read-functions --show-tilde --show-dot "$@"
|
||||
}
|
||||
|
||||
export which_declare
|
||||
export ${which_opt} which
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue