diff mbox series

[RFC,v2,net-next,20/28] selftests: tc-testing: Don't assume ENVIR is declared in local config

Message ID 20230517110232.29349-20-jhs@mojatatu.com (mailing list archive)
State RFC
Delegated to: Netdev Maintainers
Headers show
Series Introducing P4TC | expand

Checks

Context Check Description
netdev/series_format fail Series longer than 15 patches (and no cover letter)
netdev/tree_selection success Clearly marked for net-next, async
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/cc_maintainers warning 2 maintainers not CCed: shuah@kernel.org linux-kselftest@vger.kernel.org
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 14 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Jamal Hadi Salim May 17, 2023, 11:02 a.m. UTC 
Don't assume that the user's tdc_config_local.py declares ENVIR
variable.

Co-developed-by: Victor Nogueira <victor@mojatatu.com>
Signed-off-by: Victor Nogueira <victor@mojatatu.com>
Co-developed-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Pedro Tammela <pctammela@mojatatu.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
---
 tools/testing/selftests/tc-testing/tdc_config.py | 2 ++
 1 file changed, 2 insertions(+)

Comments

Marcelo Ricardo Leitner June 2, 2023, 10:08 p.m. UTC | #1 
On Wed, May 17, 2023 at 07:02:24AM -0400, Jamal Hadi Salim wrote:
> @@ -28,12 +28,14 @@ NAMES = {
>            'EBPFDIR': './'
>          }
>
> +ENVIR= {}
>
>  ENVIR = { }

Hm? :)

>
>  # put customizations in tdc_config_local.py
>  try:
>      from tdc_config_local import *
> +
>  except ImportError as ie:
>      pass
>
> --
> 2.25.1
>
Jamal Hadi Salim June 3, 2023, 2:17 p.m. UTC | #2 
On Fri, Jun 2, 2023 at 6:08 PM Marcelo Ricardo Leitner
<mleitner@redhat.com> wrote:
>
> On Wed, May 17, 2023 at 07:02:24AM -0400, Jamal Hadi Salim wrote:
> > @@ -28,12 +28,14 @@ NAMES = {
> >            'EBPFDIR': './'
> >          }
> >
> > +ENVIR= {}
> >
> >  ENVIR = { }
>
> Hm? :)
>

Sigh, i was sure we had fixed this - part of a merge issue. We'll take
care of it in the next update.

cheers,
jamal
diff mbox series

Patch

diff --git a/tools/testing/selftests/tc-testing/tdc_config.py b/tools/testing/selftests/tc-testing/tdc_config.py
index ccb0f06ef9e3..60f74011b62f 100644
--- a/tools/testing/selftests/tc-testing/tdc_config.py
+++ b/tools/testing/selftests/tc-testing/tdc_config.py
@@ -28,12 +28,14 @@  NAMES = {
           'EBPFDIR': './'
         }
 
+ENVIR= {}
 
 ENVIR = { }
 
 # put customizations in tdc_config_local.py
 try:
     from tdc_config_local import *
+
 except ImportError as ie:
     pass