From 7f45f4aeec9e839e11e77c2c003d27f3db4a0e62 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 29 Jun 2025 19:48:09 +0800 Subject: [PATCH] Fix phpunit, add SPC_SKIP_TOOLCHAIN_CHECK --- phpunit.xml.dist | 1 + src/SPC/builder/macos/MacOSBuilder.php | 5 +---- src/SPC/command/BaseCommand.php | 3 +-- src/SPC/util/GlobalEnvManager.php | 4 +++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index dc58130d..2f0c2934 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -4,5 +4,6 @@ > + diff --git a/src/SPC/builder/macos/MacOSBuilder.php b/src/SPC/builder/macos/MacOSBuilder.php index 319047a4..362a68fe 100644 --- a/src/SPC/builder/macos/MacOSBuilder.php +++ b/src/SPC/builder/macos/MacOSBuilder.php @@ -29,10 +29,7 @@ class MacOSBuilder extends UnixBuilderBase // apply global environment variables GlobalEnvManager::init(); - - if (!$this->getOption('no-env-check')) { - GlobalEnvManager::afterInit(); - } + GlobalEnvManager::afterInit(); // ---------- set necessary compile vars ---------- // concurrency diff --git a/src/SPC/command/BaseCommand.php b/src/SPC/command/BaseCommand.php index 251fcdb5..9c07b074 100644 --- a/src/SPC/command/BaseCommand.php +++ b/src/SPC/command/BaseCommand.php @@ -32,7 +32,6 @@ abstract class BaseCommand extends Command parent::__construct($name); $this->addOption('debug', null, null, 'Enable debug mode'); $this->addOption('no-motd', null, null, 'Disable motd'); - $this->addOption('no-env-check', null, null, 'Disable env check for builder'); } public function initialize(InputInterface $input, OutputInterface $output): void @@ -100,7 +99,7 @@ abstract class BaseCommand extends Command // init GlobalEnv if (!$this instanceof BuildCommand) { GlobalEnvManager::init(); - $this->input->setOption('no-env-check', true); + f_putenv('SPC_SKIP_TOOLCHAIN_CHECK=yes'); } if ($this->shouldExecute()) { try { diff --git a/src/SPC/util/GlobalEnvManager.php b/src/SPC/util/GlobalEnvManager.php index 6214476b..23ae242d 100644 --- a/src/SPC/util/GlobalEnvManager.php +++ b/src/SPC/util/GlobalEnvManager.php @@ -108,7 +108,9 @@ class GlobalEnvManager */ public static function afterInit(): void { - ToolchainManager::afterInitToolchain(); + if (!filter_var(getenv('SPC_SKIP_TOOLCHAIN_CHECK'), FILTER_VALIDATE_BOOL)) { + ToolchainManager::afterInitToolchain(); + } } /**