aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2022-01-17 11:27:59 +0100
committerMartin Liska <mliska@suse.cz>2022-01-17 11:28:47 +0100
commit4460c638fafddef1df1d35efc52ca1e339b54342 (patch)
treeb1a06b98849c5d58bf977edbb2d1c63b6733e8ec
parent84eb13b9d6a9979825f5deaa1c17762bf8c8ef9f (diff)
downloadgcc-4460c638fafddef1df1d35efc52ca1e339b54342.zip
gcc-4460c638fafddef1df1d35efc52ca1e339b54342.tar.gz
gcc-4460c638fafddef1df1d35efc52ca1e339b54342.tar.bz2
Add check_effective_target_pytest3.
gcc/testsuite/ChangeLog: * lib/gcov.exp: Use check_effective_target_pytest3. * lib/target-supports.exp: Add check_effective_target_pytest3.
-rw-r--r--gcc/testsuite/lib/gcov.exp9
-rw-r--r--gcc/testsuite/lib/target-supports.exp12
2 files changed, 16 insertions, 5 deletions
diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp
index dfa1b36..6c57515 100644
--- a/gcc/testsuite/lib/gcov.exp
+++ b/gcc/testsuite/lib/gcov.exp
@@ -17,6 +17,8 @@
# Verify various kinds of gcov output: line counts, branch percentages,
# and call return percentages. None of this is language-specific.
+load_lib "target-supports.exp"
+
global GCOV
#
@@ -274,11 +276,8 @@ proc run-gcov-pytest { args } {
set testcase [remote_download host $testcase]
set result [remote_exec host $GCOV "$testcase -i"]
- set pytest_cmd "python3 -m pytest --color=no -rap -s --tb=no"
- set result [remote_exec host "$pytest_cmd --version"]
- set status [lindex $result 0]
- if { $status != 0 } then {
- unsupported "$subdir/$testcase run-gcov-pytest python3 pytest missing"
+ if { ![check_effective_target_pytest3] } {
+ unsupported "$script pytest python3 is missing"
return
}
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 12c5ca5d..fd48475 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -11734,3 +11734,15 @@ proc check_effective_target_python3 { } {
return 0;
}
}
+
+# Return 1 if pytest module is available for python3.
+
+proc check_effective_target_pytest3 { } {
+ set result [remote_exec host "python3 -m pytest --color=no -rap -s --tb=no --version"]
+ set status [lindex $result 0]
+ if { $status == 0 } then {
+ return 1;
+ } else {
+ return 0;
+ }
+}