Remove Travis from tests

php · Sep 2, 2024 · b8b4601 · b8b4601
1 parent b289690
commit b8b4601
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 31 deletions.
diff --git a/ext/gmp/tests/gmp_setbit_long.phpt b/ext/gmp/tests/gmp_setbit_long.phpt
@@ -3,7 +3,6 @@ gmp_setbit() with large index
 --EXTENSIONS--
 gmp
 --SKIPIF--
-<?php if (getenv("TRAVIS") === "true") die("skip not suitable for Travis-CI"); ?>
 <?php if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?>
 <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); ?>
 <?php

diff --git a/ext/pcntl/tests/pcntl_cpuaffinity.phpt b/ext/pcntl/tests/pcntl_cpuaffinity.phpt
@@ -5,7 +5,6 @@ pcntl
 --SKIPIF--
 <?php
 if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity is not available");
-if (getenv('TRAVIS')) die('skip Currently fails on Travis');
 ?>
 --FILE--
 <?php

diff --git a/ext/pcntl/tests/pcntl_getcpu.phpt b/ext/pcntl/tests/pcntl_getcpu.phpt
@@ -6,7 +6,6 @@ pcntl
 <?php
 if (!function_exists("pcntl_getcpu")) die("skip pcntl_getcpu() is not available");
 if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity() is not available");
-if (getenv('TRAVIS')) die('skip Currently fails on Travis');
 if (getenv('SKIP_REPEAT')) die("skip Not repeatable");
 ?>
 --FILE--

diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt
@@ -2,7 +2,6 @@
 Test disk_free_space and its alias diskfreespace() functions : basic functionality
 --SKIPIF--
 <?php
-if (getenv("TRAVIS") === "true") die("skip inaccurate on TravisCI");
 if (getenv('CIRRUS_CI')) die('skip Inaccurate on Cirrus');
 ?>
 --INI--

diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt
@@ -2,8 +2,6 @@
 Test gzcompress() function : basic functionality
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php if (getenv('TRAVIS')) die('skip Currently fails on Travis'); ?>
 --FILE--
 <?php
 /*

diff --git a/ext/zlib/tests/gzdeflate_basic1.phpt b/ext/zlib/tests/gzdeflate_basic1.phpt
@@ -2,8 +2,6 @@
 Test gzdeflate() function : basic functionality
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php if (getenv('TRAVIS')) die('skip Currently fails on Travis'); ?>
 --FILE--
 <?php
 /*

diff --git a/ext/zlib/tests/gzencode_basic1.phpt b/ext/zlib/tests/gzencode_basic1.phpt
@@ -2,8 +2,6 @@
 Test gzencode() function : basic functionality
 --EXTENSIONS--
 zlib
---SKIPIF--
-<?php if (getenv('TRAVIS')) die('skip Currently fails on Travis'); ?>
 --FILE--
 <?php
 /*

diff --git a/run-tests.php b/run-tests.php
@@ -308,8 +308,6 @@ function main(): void
 
     $no_file_cache = '-d opcache.file_cache= -d opcache.file_cache_only=0';
 
-    define('TRAVIS_CI', (bool) getenv('TRAVIS'));
-
     // Determine the tests to be run.
 
     $test_files = [];
@@ -916,7 +914,7 @@ function save_results(string $output_file, bool $prompt_to_save_results): void
 {
     global $sum_results, $failed_test_summary, $PHP_FAILED_TESTS, $php;
 
-    if (getenv('NO_INTERACTION') || TRAVIS_CI) {
+    if (getenv('NO_INTERACTION')) {
         return;
     }
 
@@ -1439,8 +1437,7 @@ function run_all_tests_parallel(array $test_files, array $env, ?string $redir_te
             "GLOBALS" => $GLOBALS,
             "constants" => [
                 "INIT_DIR" => INIT_DIR,
-                "TEST_PHP_SRCDIR" => TEST_PHP_SRCDIR,
-                "TRAVIS_CI" => TRAVIS_CI
+                "TEST_PHP_SRCDIR" => TEST_PHP_SRCDIR
             ]
         ])) . "\n";
 

diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt
@@ -32,10 +32,6 @@ if (empty($enough_free_ram)) {
     die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram));
 }
 
-if (getenv('TRAVIS')) {
-    die("skip Fails intermittently on travis");
-}
-
 if (getenv('CIRRUS_CI')) die('skip Fails on Cirrus');
 
 if (getenv('SKIP_PERF_SENSITIVE')) {

diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc
@@ -296,18 +296,6 @@ class Tester
         }
     }
 
-    /**
-     * Skip if running on Travis.
-     *
-     * @param $message
-     */
-    static public function skipIfTravis($message)
-    {
-        if (getenv("TRAVIS")) {
-            die('skip Travis: ' . $message);
-        }
-    }
-
     /**
      * Skip if not running as root.
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ pcntl @@
     --SKIPIF--
     <?php
     if (!function_exists("pcntl_setcpuaffinity")) die("skip pcntl_setcpuaffinity is not available");
-    if (getenv('TRAVIS')) die('skip Currently fails on Travis');
     ?>
     --FILE--
     <?php
@@ Expand Down @@