From 01a7e59f1a1bb722deb9aec01ace54adbd2fa556 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 6 Jun 2023 12:05:53 -0700 Subject: [PATCH] adding more spinoff test options --- .efrocachemap | 32 ++++++++++++++++---------------- Makefile | 9 ++++++++- tools/batools/spinoff/_test.py | 6 +++++- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 9ab77fff..205441f4 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4080,18 +4080,18 @@ "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/f4/6f/aa2b417a9797fe0f11c4f542aeb3", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b4/07/fb400d012c9cc329c3a217852e26", "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/0f/3c/d1b770ff37a9b53c860362f05400", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/bd/16/c1709db56780f001b5b1bf47317f", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/12/24/78dd6fbb0638fac3ce0c0fb1fc69", "build/prefab/full/mac_arm64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/a5/7e/9ceb3f55b731cffbc328ea743491", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/79/15/bcbd5d58fdc570b4b4eb5655ae7f", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/ac/83/4c6675fd1baf33474ba4ac7da33a", "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/c5/54/ec4fd0499ca54baa05cd9bef5c78", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/fe/20/59037de2db9181b1f96be6e7d80a", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "https://files.ballistica.net/cache/ba1/ab/7d/afe43e0b5036e6fe142532278635", "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "https://files.ballistica.net/cache/ba1/3e/a3/13891776879d294ab560c47e5053", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/73/00/58a11fad57922bfebd07b2dfc5fa", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/03/5e/4d38fb9c9dfa2d9cca65b7023f7a", "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "https://files.ballistica.net/cache/ba1/b2/34/0e687a8fca611ec2caa43bab1170", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/a8/65/5fb5e25457fa8e278b97f01e82e2", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/e2/bf/9389ad3c3b8fee044ce2d5b07432", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/a4/14/3fd19331236afb93ebe295bb328f", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/f1/93/2291e8eb86dc7c0e07b0b60877c6", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/4a/cd/d0cf216f81d1f295cbcc776d052c", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "https://files.ballistica.net/cache/ba1/d4/d1/4a82e5f2f808a185ade254391412", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/bd/24/b7050cdc9d85018c48731ba2b8b7", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "https://files.ballistica.net/cache/ba1/8a/61/213c6e653c1cc4b0128a0d115c78", "build/prefab/lib/linux_arm64_gui/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/98/32/43c61f1e11520f764158cf0e76d2", "build/prefab/lib/linux_arm64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/ca/65/cba463f21a8f76c5bbfe27cae124", "build/prefab/lib/linux_arm64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/73/20/119211f1700bb5a410cedf4e76f2", @@ -4108,14 +4108,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/90/9b/94f733c3a48691e02240e04dc792", "build/prefab/lib/mac_x86_64_server/debug/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/2e/c7/873af48627997b6fab4b2c4ba6bc", "build/prefab/lib/mac_x86_64_server/release/libballistica_plus.a": "https://files.ballistica.net/cache/ba1/3a/94/4780fada10f0fc3f43a54f29c86f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/4c/1e/9f1e7d2c79cfe7d012453e98209b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/8b/13/e584a4cd61cdde4636fbd43586cc", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/e6/e2/09a91d25f903cadd653c9b530d2b", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/d9/93/e007b82c50e019690ee61e72d847", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/50/a5/14b0b319f0c9e18a72cae8f18432", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/1a/9a/6adcdb3c87c7db6d9a31d9527926", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/03/dc/954de197cd62e0e4bee19b040777", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/15/1d/aa3f018074c2e6b79a81915db7da", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/44/48/e4f095b8c609f2bdeeeaf63889c0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/3a/b4/b4ac46515d4257e6c0c890008ab2", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/9c/7f/f27157a99151fa55e8f0063e54a0", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/e1/e3/4d4d4013de42b9169066aee7a18d", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "https://files.ballistica.net/cache/ba1/5a/b8/1129a3c5c480132eec3473fb7809", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "https://files.ballistica.net/cache/ba1/a2/c4/31d196d41afc5ea81433ad32e5a2", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "https://files.ballistica.net/cache/ba1/94/ba/f50c2427dd7cb8ddb4c3da15ecf5", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "https://files.ballistica.net/cache/ba1/33/93/7ccf36895aae5247424df96999bf", "src/assets/ba_data/python/babase/_mgen/__init__.py": "https://files.ballistica.net/cache/ba1/52/c6/c11130af7b10d6c0321add5518fa", "src/assets/ba_data/python/babase/_mgen/enums.py": "https://files.ballistica.net/cache/ba1/38/c3/1dedd5e74f2508efc5974c8815a1", "src/ballistica/base/mgen/pyembed/binding_base.inc": "https://files.ballistica.net/cache/ba1/75/9f/bcf597b362c9f2480cb348188bdd", diff --git a/Makefile b/Makefile index 05cbddd1..7bf97ca2 100644 --- a/Makefile +++ b/Makefile @@ -598,9 +598,15 @@ build/prefab/lib/windows/Release_%/BallisticaKitHeadlessPlus.pdb: .efrocachemap spinoff-test-empty: tools/pcommand spinoff_test empty $(SPINOFF_TEST_EXTRA_ARGS) +spinoff-test-core: + tools/pcommand spinoff_test core $(SPINOFF_TEST_EXTRA_ARGS) + spinoff-test-base: tools/pcommand spinoff_test base $(SPINOFF_TEST_EXTRA_ARGS) +spinoff-test-plus: + tools/pcommand spinoff_test plus $(SPINOFF_TEST_EXTRA_ARGS) + spinoff-test-clean: rm -rf build/spinofftest @@ -627,7 +633,8 @@ spinoff-upgrade: @tools/pcommand echo GRN Spinoff upgrade successful! # Tell make which of these targets don't represent files. -.PHONY: spinoff-test-empty spinoff-update spinoff-upgrade +.PHONY: spinoff-test-empty spinoff-test-core spinoff-test-base \ + spinoff-test-plus spinoff-test-clean spinoff-update spinoff-upgrade ################################################################################ diff --git a/tools/batools/spinoff/_test.py b/tools/batools/spinoff/_test.py index c6e7fa8b..ad1f4baf 100644 --- a/tools/batools/spinoff/_test.py +++ b/tools/batools/spinoff/_test.py @@ -16,6 +16,7 @@ def spinoff_test(args: list[str]) -> None: import os import subprocess + from batools.featureset import FeatureSet from efrotools import extract_flag from efro.terminal import Clr from efro.error import CleanError @@ -29,8 +30,11 @@ def spinoff_test(args: list[str]) -> None: ) if len(args) != 1: raise CleanError('Expected 1 arg.') + + featuresets = {fs.name: fs for fs in FeatureSet.get_all_for_project('.')} + testtype = args[0] - if testtype in {'empty', 'base'}: + if testtype == 'empty' or testtype in featuresets: path = f'build/spinofftest/{testtype}' print( f'{Clr.BLD}Running spinoff test{Clr.RST}'