mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
help: the features of the build listed, and the tests skip what they need
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI Linux / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI MacOS / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI Windows / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI cmake / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
C/C++ CI cmake / ubuntu-latest (wolfSSL) (push) Has been cancelled
3proxy --help (and the usage message of a bad invocation) now lists what the build was made with: TLS and its backend, RADIUS, PCRE, IPv6, UNIX sockets, the built-in HTTP server, transparency, ODBC and the optional proxy services. The test runner reads the list before the first case and the cases state the features they need with t.skip_unless(), so a build without a feature skips its cases instead of failing them; a binary too old to report anything skips the cases with needs and runs the rest.
This commit is contained in:
1 parent
c0d9914fb8
commit
38b62bd30b
37 files changed
+212
-15
No files matched your search
+34
-1
@@ -48,6 +48,37 @@ def load_case(path):
|
||||
return name, module
|
||||
|
||||
|
||||
def built_features(binary):
|
||||
"""The features the binary reports in `3proxy --help`, as a set.
|
||||
|
||||
A binary too old to have the list, or one that cannot be run at all,
|
||||
reports nothing: every case that needs a feature then skips, and the
|
||||
ones that need none still run.
|
||||
"""
|
||||
import subprocess
|
||||
try:
|
||||
done = subprocess.run([binary, "--help"], stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT, timeout=15)
|
||||
text = done.stdout.decode("utf-8", "replace")
|
||||
except (OSError, subprocess.SubprocessError):
|
||||
return frozenset()
|
||||
features = set()
|
||||
collecting = False
|
||||
for line in text.splitlines():
|
||||
stripped = line.strip()
|
||||
if line.startswith("built with:"):
|
||||
collecting = True
|
||||
rest = stripped[len("built with:"):].strip()
|
||||
if rest:
|
||||
features.update(rest.split())
|
||||
continue
|
||||
if collecting:
|
||||
if not line[:1].isspace() or not stripped:
|
||||
break
|
||||
features.update(stripped.split())
|
||||
return frozenset(features)
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("pattern", nargs="?", default="",
|
||||
@@ -76,7 +107,9 @@ def main():
|
||||
return 2
|
||||
|
||||
tmpdir = tempfile.mkdtemp(prefix="3proxy-tests.")
|
||||
features = built_features(binary)
|
||||
print(f"3proxy tests: {binary}")
|
||||
print(f"built with: {' '.join(sorted(features)) or '(nothing reported)'}")
|
||||
print(f"working in: {tmpdir}\n")
|
||||
|
||||
passed = failed = skipped = 0
|
||||
@@ -86,7 +119,7 @@ def main():
|
||||
for path in paths:
|
||||
name, module = load_case(path)
|
||||
print(f" {name}")
|
||||
tester = Tester(binary, tmpdir, name)
|
||||
tester = Tester(binary, tmpdir, name, features)
|
||||
error = None
|
||||
try:
|
||||
module.run(tester)
|
||||
|
||||
Reference in new issue
Block a user