Deplacer test.inc dans legacy aussi

tests/LegacyUnitHtmlTest.php

@@ -30,7 +30,7 @@ class LegacyUnitHtmlTest extends TestCase {
 	}
 
 	public function legacyHtmlfileNameProvider(){
-		require_once(__DIR__ . '/../test.inc');
+		require_once(__DIR__ . '/legacy/test.inc');
 
 		$liste_fichiers = tests_legacy_lister('html');
 		$tests = [];

tests/LegacyUnitPhpTest.php

@@ -30,7 +30,7 @@ class LegacyUnitPhpTest extends TestCase {
 	}
 
 	public function legacyPhpfileNameProvider(){
-		require_once(__DIR__ . '/../test.inc');
+		require_once(__DIR__ . '/legacy/test.inc');
 
 		$liste_fichiers = tests_legacy_lister('php');
 		$tests = [];
@@ -50,6 +50,7 @@ class LegacyUnitPhpTest extends TestCase {
 
 		$output = [];
 		$returnCode = 0;
+		chdir(__DIR__ . '/legacy');
 		exec("/usr/bin/env php \"$realPath\" mode=test_general", $output, $returnCode);
 
 		if ($returnCode) {

test.inc → tests/legacy/test.inc

@@ -10,7 +10,7 @@
  *
  */
 // let's go spip
-define('_SPIP_TEST_INC', dirname(__FILE__));
+define('_SPIP_TEST_INC', dirname(dirname(dirname(__FILE__))));
 // si rien defini on va dans le public
 @define('_SPIP_TEST_CHDIR', dirname(_SPIP_TEST_INC));
 chdir(_SPIP_TEST_CHDIR);
@@ -24,7 +24,7 @@ chdir(_SPIP_TEST_CHDIR);
 #}
 
 require dirname(_SPIP_TEST_INC) . '/ecrire/inc_version.php';
-include_once __DIR__ . '/tests/legacy/test_fonctions.php';
+include_once __DIR__ . '/test_fonctions.php';
 
 
 // pour notice sur recuperer_fond()

tests/legacy/unit/cache/cache_sessions.php

@@ -5,15 +5,10 @@
 	define('_VAR_MODE','recalcul');
 
 	// recherche test.inc qui nous ouvre au monde spip
-	$deep = 1;
-	$include = 'tests/test.inc';
-	while (!defined('_SPIP_TEST_INC') && $deep++ < 6) {
-		$include = '../' . $include;
-		@include $include;
-	}
-	if (!defined('_SPIP_TEST_INC')) {
-		die("Pas de $include");
-	}
+	$remonte = __DIR__ . '/';
+	while (!is_file($remonte."test.inc"))
+		$remonte = $remonte."../";
+	require $remonte.'test.inc';
 
 	tests_init_dossier_squelettes();
 

tests/legacy/unit/config/depot_meta.php

@@ -4,15 +4,10 @@
 	$test = 'config/meta';
 
 	// recherche test.inc qui nous ouvre au monde spip
-	$deep = 1;
-	$include = 'tests/test.inc';
-	while (!defined('_SPIP_TEST_INC') && $deep++ < 6) {
-		$include = '../' . $include;
-		@include $include;
-	}
-	if (!defined('_SPIP_TEST_INC')) {
-		die("Pas de $include");
-	}
+	$remonte = __DIR__ . '/';
+	while (!is_file($remonte."test.inc"))
+		$remonte = $remonte."../";
+	require $remonte.'test.inc';
 
 	include_spip('inc/config');
 

tests/legacy/unit/config/depot_meta_perso.php

@@ -4,15 +4,10 @@
 	$test = 'config/meta_perso';
 
 	// recherche test.inc qui nous ouvre au monde spip
-	$deep = 1;
-	$include = 'tests/test.inc';
-	while (!defined('_SPIP_TEST_INC') && $deep++ < 6) {
-		$include = '../' . $include;
-		@include $include;
-	}
-	if (!defined('_SPIP_TEST_INC')) {
-		die("Pas de $include");
-	}
+	$remonte = __DIR__ . '/';
+	while (!is_file($remonte."test.inc"))
+		$remonte = $remonte."../";
+	require $remonte.'test.inc';
 
 	include_spip('inc/config');
 

tests/legacy/unit/config/depot_metapack.php

@@ -4,15 +4,10 @@
 	$test = 'config/metapack';
 
 	// recherche test.inc qui nous ouvre au monde spip
-	$deep = 1;
-	$include = 'tests/test.inc';
-	while (!defined('_SPIP_TEST_INC') && $deep++ < 6) {
-		$include = '../' . $include;
-		@include $include;
-	}
-	if (!defined('_SPIP_TEST_INC')) {
-		die("Pas de $include");
-	}
+	$remonte = __DIR__ . '/';
+	while (!is_file($remonte."test.inc"))
+		$remonte = $remonte."../";
+	require $remonte.'test.inc';
 
 	include_spip('inc/config');
 

tests/legacy/unit/config/expliquer_config.php

@@ -4,15 +4,10 @@
 	$test = 'expliquer_config';
 
 	// recherche test.inc qui nous ouvre au monde spip
-	$deep = 1;
-	$include = 'tests/test.inc';
-	while (!defined('_SPIP_TEST_INC') && $deep++ < 6) {
-		$include = '../' . $include;
-		@include $include;
-	}
-	if (!defined('_SPIP_TEST_INC')) {
-		die("Pas de $include");
-	}
+	$remonte = __DIR__ . '/';
+	while (!is_file($remonte."test.inc"))
+		$remonte = $remonte."../";
+	require $remonte.'test.inc';
 
 	include_spip('inc/config');
 

tests/legacy/unit/entrees_sorties/flock_sous_repertoire.php

@@ -7,10 +7,11 @@
 
 $test = 'sous_repertoire';
 $remonte = __DIR__ . '/';
-while (!is_dir($remonte . "ecrire")) {
+while (!is_file($remonte . "test.inc")) {
     $remonte = $remonte."../";
 }
-require $remonte . 'tests/test.inc';
+require $remonte . 'test.inc';
+
 $ok = true;
 
 $sous_repertoire = 'test' . md5(rand());