PHP: Removed 32-bit-specific PHP failure list.

32 and 64-bit PHP should have the same set of failures now.
BartKub · Nov 2, 2020 · f5ab3b1 · f5ab3b1
1 parent 6e19526
commit f5ab3b1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 56 deletions.
diff --git a/conformance/Makefile.am b/conformance/Makefile.am
@@ -353,9 +353,6 @@ test_php: protoc_middleman conformance-test-runner conformance-php $(other_langu
 test_php_c: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs)
 	./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php-c
 
-test_php_c_32: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs)
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c_32.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php-c
-
 # These depend on library paths being properly set up.  The easiest way to
 # run them is to just use "tox" from the python dir.
 test_python: protoc_middleman conformance-test-runner

diff --git a/conformance/failure_list_php_c_32.txt b/conformance/failure_list_php_c_32.txt
diff --git a/tests.sh b/tests.sh
@@ -478,16 +478,10 @@ build_php7.0() {
 }
 
 build_php7.0_c() {
-  IS_64BIT=$1
   use_php 7.0
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -503,16 +497,10 @@ build_php7.0_mixed() {
 }
 
 build_php7.0_zts_c() {
-  IS_64BIT=$1
   use_php_zts 7.0
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -575,16 +563,10 @@ build_php7.1() {
 }
 
 build_php7.1_c() {
-  IS_64BIT=$1
   use_php 7.1
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -600,16 +582,10 @@ build_php7.1_mixed() {
 }
 
 build_php7.1_zts_c() {
-  IS_64BIT=$1
   use_php_zts 7.1
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -624,16 +600,10 @@ build_php7.4() {
 }
 
 build_php7.4_c() {
-  IS_64BIT=$1
   use_php 7.4
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -649,16 +619,10 @@ build_php7.4_mixed() {
 }
 
 build_php7.4_zts_c() {
-  IS_64BIT=$1
   use_php_zts 7.4
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }
 
@@ -673,16 +637,10 @@ build_php8.0() {
 }
 
 build_php8.0_c() {
-  IS_64BIT=$1
   use_php 8.0
   php/tests/test.sh
   pushd conformance
-  if [ "$IS_64BIT" = "true" ]
-  then
-    make test_php_c
-  else
-    make test_php_c_32
-  fi
+  make test_php_c
   popd
 }