Merge ~arighi/qa-regression-testing:support-python2-and-python3 into qa-regression-testing:master

[Andrea Righi]

In lunar we are getting some test failures reporting the error:

 /usr/bin/env: ‘python2’: No such file or directory

Fix by changing the shebang of the scripts in kernel-security to dynamically detect the availability of python2 or python3.

[Francis Ginther (fginther)]

This overlaps https://code.launchpad.net/~fginther/qa-regression-testing/+git/qa-regression-testing/+merge/440503.

I'd prefer to just convert all of these to python3 as we really have no reason to keep running these with python2 (we have python 3.4 in trusty which is as far back as we would need to run any kernel testing).

I'll propose another MP to address dac-bypass.py and test-kernel-security.py.

[Francis Ginther (fginther)]

I recommend replacing this MP with https://code.launchpad.net/~fginther/qa-regression-testing/+git/qa-regression-testing/+merge/440800 which applies additional 2to3 updates.

[Steve Beattie (sbeattie)]

My apologies for not getting to this earlier, other commits have landed that address the same issues.

Unmerged commits

1c71217... by Andrea Righi on 2023-04-11

kernel-security: support both python2 and python3

python2 has been removed in Lunar. Change the shebang of the python
scripts to select either python2 or python3 at runtime, depending on
which one is available in the system.

Signed-off-by: Andrea Righi <email address hidden>

	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)
	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)
	imagemagick:0 (build)
	imagemagick:1 (build)
	imagemagick:2 (build)
	gcc-security:0 (build)
	gcc-security:1 (build)
	gcc-security:2 (build)
	gnupg:0 (build)
	gnupg:1 (build)
	gnupg:2 (build)
	sudo:0 (build)
	sudo:1 (build)
	sudo:2 (build)

1 → 36 of 36 results

First • Previous • Next • Last

diff --git a/scripts/kernel-security/errno-read.py b/scripts/kernel-security/errno-read.py
index 8e31c38..27605da 100755
--- a/scripts/kernel-security/errno-read.py
+++ b/scripts/kernel-security/errno-read.py
@@ -1,4 +1,7 @@
-#!/usr/bin/env python2
+#!/bin/sh
+''':'
+if which python3 > /dev/null 2>&1; then exec python3 "$0" "$@"; else exec python2 "$0" "$@"; fi
+'''
 from __future__ import print_function
 import sys
 try:
diff --git a/scripts/kernel-security/proc-leaks/dac-bypass.py b/scripts/kernel-security/proc-leaks/dac-bypass.py
index 740bacb..9148b8b 100755
--- a/scripts/kernel-security/proc-leaks/dac-bypass.py
+++ b/scripts/kernel-security/proc-leaks/dac-bypass.py
@@ -1,4 +1,7 @@
-#!/usr/bin/env python2
+#!/bin/sh
+''':'
+if which python3 > /dev/null 2>&1; then exec python3 "$0" "$@"; else exec python2 "$0" "$@"; fi
+'''
 # Demonstrates DAC bypass on /proc/$pid file descriptors across setuid exec
 # Author: Kees Cook <[e-mail]>
 # License: GPLv2
diff --git a/scripts/kernel-security/proc-maps/maps-protection.py b/scripts/kernel-security/proc-maps/maps-protection.py
index 6cbcf57..9fbe4b9 100755
--- a/scripts/kernel-security/proc-maps/maps-protection.py
+++ b/scripts/kernel-security/proc-maps/maps-protection.py
@@ -1,4 +1,7 @@
-#!/usr/bin/env python2
+#!/bin/sh
+''':'
+if which python3 > /dev/null 2>&1; then exec python3 "$0" "$@"; else exec python2 "$0" "$@"; fi
+'''
 #
 # This verifies that memory-segment listing /proc files (maps, smaps) are
 # not world-readable, and that setuid priv-dropped process can still read
diff --git a/scripts/test-kernel-security.py b/scripts/test-kernel-security.py
index c855cbd..a288200 100755
--- a/scripts/test-kernel-security.py
+++ b/scripts/test-kernel-security.py
@@ -1,4 +1,7 @@
-#!/usr/bin/env python2
+#!/bin/sh
+''':'
+if which python3 > /dev/null 2>&1; then exec python3 "$0" "$@"; else exec python2 "$0" "$@"; fi
+'''
 #
 #    kernel-security.py regression testing script for kernel and
 #    security features