| Message ID | 146668234418.21827.13311786283737930387.stgit@nfdev2.cica.es |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
On Thu, Jun 23, 2016 at 01:45:44PM +0200, Arturo Borrero Gonzalez wrote:
> Better use the local tree nft binary rather than the installed one.
Applied, thanks Arturo.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/shell/README b/tests/shell/README index 2ce4120..cc35cab 100644 --- a/tests/shell/README +++ b/tests/shell/README @@ -20,4 +20,6 @@ Also, test-files will receive the environment variable $NFT which contains the path to the nftables binary being tested. You can pass an arbitrary $NFT value as well: - % NFT=../../src/nft ./run-tests.sh + % NFT=/usr/local/nft ./run-tests.sh + +By default the tests are run with the nft binary at '../../src/nft' diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index b10445d..3277655 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -3,6 +3,7 @@ # Configuration TESTDIR="./" RETURNCODE_SEPARATOR="_" +SRC_NFT="../../src/nft" msg_error() { echo "E: $1 ..." >&2 @@ -21,7 +22,7 @@ if [ "$(id -u)" != "0" ] ; then msg_error "this requires root!" fi -[ -z "$NFT" ] && NFT="$(which nft)" +[ -z "$NFT" ] && NFT=$SRC_NFT if [ ! -x "$NFT" ] ; then msg_error "no nft binary!" else
Better use the local tree nft binary rather than the installed one. Requested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> --- tests/shell/README | 4 +++- tests/shell/run-tests.sh | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html