mirror of
https://github.com/sunnypilot/sunnypilot.git
synced 2026-09-18 10:23:43 +08:00
cabana: build binary directly, drop wrapper script (#38781)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
bootstrap_icons.cc
|
||||
|
||||
_cabana_ui
|
||||
cabana
|
||||
dbc/car_fingerprint_to_dbc.json
|
||||
tests/test_cabana
|
||||
|
||||
@@ -51,7 +51,7 @@ if arch == "Darwin":
|
||||
ui_env['FRAMEWORKS'] = ['OpenGL', 'Cocoa', 'IOKit', 'CoreFoundation', 'CoreVideo', 'CoreMedia', 'Security', 'VideoToolbox']
|
||||
else:
|
||||
ui_libs += ['GL', 'dl']
|
||||
cabana_ui = ui_env.Program('_cabana_ui', ui_objs, LIBS=ui_libs)
|
||||
cabana_ui = ui_env.Program('cabana', ui_objs, LIBS=ui_libs)
|
||||
|
||||
if GetOption('extras'):
|
||||
cabana_core_test_env = env.Clone()
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
|
||||
ROOT="$(cd "$DIR/../../../" && pwd)"
|
||||
|
||||
cd "$ROOT"
|
||||
scons -u "openpilot/tools/cabana/_cabana_ui" openpilot/cereal/messaging/bridge
|
||||
|
||||
exec "$DIR/_cabana_ui" "$@"
|
||||
@@ -8,6 +8,6 @@ CABANA_DIR = Path(__file__).parent.parent
|
||||
|
||||
class TestCabanaUi(OpenpilotTestCase):
|
||||
def test_help(self):
|
||||
result = subprocess.run(["./_cabana_ui", "-h"], cwd=CABANA_DIR, capture_output=True, text=True)
|
||||
result = subprocess.run(["./cabana", "-h"], cwd=CABANA_DIR, capture_output=True, text=True)
|
||||
assert result.returncode == 0, result.stderr
|
||||
assert "Usage:" in result.stderr
|
||||
|
||||
Reference in New Issue
Block a user