From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 22 Dec 2017 01:44:22 +0000 (+0000)
Subject: Merge "shell: Add NO_LOCALSETTINGS restriction"
X-Git-Tag: 1.31.0-rc.0~1134
X-Git-Url: https://git.cyclocoop.org/?a=commitdiff_plain;h=983173f3be216070d7bcd2c0930dfe86e39f5b5b;p=lhc%2Fweb%2Fwiklou.git

Merge "shell: Add NO_LOCALSETTINGS restriction"
---

983173f3be216070d7bcd2c0930dfe86e39f5b5b
diff --cc tests/phpunit/includes/shell/FirejailCommandTest.php
index fab14cad7a,57d820e0d7..7d6d7f817d
--- a/tests/phpunit/includes/shell/FirejailCommandTest.php
+++ b/tests/phpunit/includes/shell/FirejailCommandTest.php
@@@ -29,9 -29,10 +29,10 @@@ class FirejailCommandTest extends PHPUn
  		// @codingStandardsIgnoreStart
  		$env = "'MW_INCLUDE_STDERR=;MW_CPU_LIMIT=180; MW_CGROUP='\'''\''; MW_MEM_LIMIT=307200; MW_FILE_SIZE_LIMIT=102400; MW_WALL_CLOCK_LIMIT=180; MW_USE_LOG_PIPE=yes'";
  		// @codingStandardsIgnoreEnd
 -		$limit = "$IP/includes/shell/limit.sh";
 +		$limit = "/bin/bash '$IP/includes/shell/limit.sh'";
  		$profile = "--profile=$IP/includes/shell/firejail.profile";
- 		$default = '--noroot --seccomp=@default --private-dev';
+ 		$blacklist = '--blacklist=' . realpath( MW_CONFIG_FILE );
+ 		$default = "$blacklist --noroot --seccomp=@default --private-dev";
  		return [
  			[
  				'No restrictions',