Daniel Werner has submitted this change and it was merged. Change subject: Allow entry by qunit jenkins tests ......................................................................
Allow entry by qunit jenkins tests Change-Id: Iacc5f6f0f0c19efd90cb4a06aa12076e31a52cb0 --- M Wikibase.php 1 file changed, 3 insertions(+), 6 deletions(-) Approvals: Daniel Werner: Looks good to me, approved jenkins-bot: Verified diff --git a/Wikibase.php b/Wikibase.php index 3d0fefe..5805c37 100644 --- a/Wikibase.php +++ b/Wikibase.php @@ -10,18 +10,15 @@ * installation instructions is recommended. See the INSTALL * and README file for more information. * - * @file - * * @licence GNU GPL v2+ * @author Jeroen De Dauw < jeroended...@gmail.com > * @author Daniel Kinzler + * @author Adam Shorland */ //TODO: Use a different file for jenkins, use this for a standard repo+client setup. -$jenkins_job_name = getenv( 'JOB_NAME' ); - -if( PHP_SAPI !== 'cli' || $jenkins_job_name === false ) { +if( isset( $wgWikimediaJenkinsCI ) && !$wgWikimediaJenkinsCI ) { die( "This entry point is for use by the Jenkins testing framework only.\n" . "Use repo/Wikibase.php resp. client/WikibaseClient.php instead.\n" ); } @@ -30,7 +27,7 @@ define( 'WB_EXPERIMENTAL_FEATURES', true ); } -switch( $jenkins_job_name ) { +switch( getenv( 'JOB_NAME' ) ) { case 'mwext-Wikibase-client-tests': require_once __DIR__ . '/client/WikibaseClient.php'; require_once __DIR__ . '/client/ExampleSettings.php'; -- To view, visit https://gerrit.wikimedia.org/r/89707 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iacc5f6f0f0c19efd90cb4a06aa12076e31a52cb0 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits