diff --git a/scripts/package.py b/scripts/package.py index 66c4acddd..9af1cd906 100755 --- a/scripts/package.py +++ b/scripts/package.py @@ -28,7 +28,6 @@ DEFAULT_PRODUCT_NAME = "Deskflow" DEFAULT_FILENAME_BASE = "deskflow" DEFAULT_PROJECT_BUILD_DIR = "build" DEFAULT_DIST_DIR = "dist" -DEFAULT_TEST_CMD = "deskflow-server --version" DEFAULT_PACKAGE_NAME = "deskflow" @@ -51,7 +50,6 @@ def main(): DEFAULT_FILENAME_BASE, DEFAULT_PROJECT_BUILD_DIR, DEFAULT_DIST_DIR, - DEFAULT_TEST_CMD, DEFAULT_PRODUCT_NAME, version=args.package_version, ) @@ -60,7 +58,6 @@ def package( filename_prefix, project_build_dir, dist_dir, - test_cmd, product_name, version, source_dir=None, diff --git a/scripts/tests.py b/scripts/tests.py deleted file mode 100755 index 411db37b8..000000000 --- a/scripts/tests.py +++ /dev/null @@ -1,82 +0,0 @@ -#!/usr/bin/env python3 - -# Deskflow -- mouse and keyboard sharing utility -# Copyright (C) 2024 Symless Ltd. -# -# This package is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# found in the file LICENSE that should have accompanied this file. -# -# This package is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -import lib.env as env - -env.ensure_in_venv(__file__) - -import argparse, os, sys -import lib.cmd_utils as cmd_utils -import lib.colors as colors - -valgrind_bin = "valgrind" - - -def main(): - parser = argparse.ArgumentParser() - parser.add_argument("--unit-tests", action="store_true") - parser.add_argument("--integ-tests", action="store_true") - parser.add_argument( - "--filter-file", - type=str, - help="Takes the base filename without extension and uses it as a filter", - ) - parser.add_argument( - "--ignore-return-code", - action="store_true", - help="Ignore the return code of the test command", - ) - parser.add_argument( - "--valgrind", - action="store_true", - help="Run the test command with valgrind", - ) - - args = parser.parse_args() - binary = get_binary_path(args) - - if args.filter_file: - file_base = os.path.basename(args.filter_file) - without_ext = os.path.splitext(file_base)[0] - command = [binary, f"--gtest_filter={without_ext}*"] - else: - command = [binary] - - if args.valgrind: - if not cmd_utils.has_command(valgrind_bin): - print(f"{colors.ERROR_TEXT} {valgrind_bin} not found") - sys.exit(1) - - command = [valgrind_bin] + command - - result = cmd_utils.run(command, print_cmd=True, check=False) - if not args.ignore_return_code: - sys.exit(result.returncode) - - -def get_binary_path(args): - base_dir = "./build/bin" - if args.unit_tests: - return f"{base_dir}/unittests" - elif args.integ_tests: - return f"{base_dir}/integtests" - else: - raise RuntimeError("No test type specified") - - -if __name__ == "__main__": - main()