From d5b5cffa3b2eb3dc20c17515f0bb3377b309c618 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 13 Jun 2023 13:44:32 +0200 Subject: [PATCH] test/env: Provide a wrapper for qeneth to the running topology With this change, when running an interactive test session, a plain `qeneth status` will show the status for the network started by test/env. --- test/env | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/test/env b/test/env index ec70e8ed..fbc2863f 100755 --- a/test/env +++ b/test/env @@ -2,7 +2,7 @@ set -e -INFIX_TEST=ghcr.io/kernelkit/infix-test:0.2 +INFIX_TEST=ghcr.io/kernelkit/infix-test:0.3 extract_yang() { @@ -36,17 +36,24 @@ start_topology() (cd $envdir/qeneth/ && $qeneth generate && $qeneth start) INFAMY_ARGS="$INFAMY_ARGS $envdir/qeneth/topology.dot" + + cat <"$envdir/bin/qeneth" +#!/bin/sh +set -x +cd $envdir/qeneth && exec $ixdir/qeneth/qeneth "\$@" +EOF + chmod +x "$envdir/bin/qeneth" } usage() { cat <] [-q ] [...] +usage: test/env [-C [-K]] [-f ] [-q ] [...] Run in a pre-packaged container with all the packages required for running the test suite installed. - Option: + Options: -C Don't containerize the command, run it directly in the current