summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/expect
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2024-10-31 11:15:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-12 11:19:44 +0000
commiteca49ca726c1551fbe9e0adcfdfde529133abbf9 (patch)
tree00ea5de73e15a8f62a92746467b15b9b4cb58fa5 /meta/recipes-devtools/expect
parentb33b064b4811fd270cb77be47668357722d38f65 (diff)
downloadpoky-eca49ca726c1551fbe9e0adcfdfde529133abbf9.tar.gz
tcl8: re-add tcl 8 to support building expect
I'd be happy to remove expect from core as it has been unmaintained for years, but sadly gcc/binutils test suites are basically written in it (via dejagnu), and ltp makes use of it as well. I attempted porting expect to tcl 9, but it's a tcl extension and makes extensive use of features that have been deprecated in tcl 8 and removed in tcl 9, and even pokes into tcl internals. At some point hopefully the GNU toolchain upstreams are going to notice; for now we'll carry tcl (latest) and tcl8 recipes. tcl and tcl8 packages can be co-installed, the latter is adjusted to contain tclsh8. tcl-dev and tcl8-dev packages can also be co-installed, a few files in tcl8-dev are renamed to avoid clashes with tcl-dev (tcl.pc -> tcl8.pc, and similar for tclConfig.sh and tclooConfig.sh). (From OE-Core rev: 8ec7bfc6644aff011545dfb0f5a415e79d7b0844) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/expect')
-rwxr-xr-xmeta/recipes-devtools/expect/expect/run-ptest2
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.4.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/expect/expect/run-ptest b/meta/recipes-devtools/expect/expect/run-ptest
index 856c314eaf..1d35ba79d3 100755
--- a/meta/recipes-devtools/expect/expect/run-ptest
+++ b/meta/recipes-devtools/expect/expect/run-ptest
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3out_put=`tclsh tests/all.tcl -verbose bpse` 3out_put=`tclsh8 tests/all.tcl -verbose bpse`
4echo 4echo
5echo "${out_put}" | awk '/PASSED|FAILED|SKIPPED/{gsub(/PASSED/,"PASS"); gsub(/FAILED/,"FAIL"); gsub(/SKIPPED/,"SKIP"); if ($NF=="PASS"){print $NF": "$(NF-1)}else{print $NF": "$2}}' | uniq 5echo "${out_put}" | awk '/PASSED|FAILED|SKIPPED/{gsub(/PASSED/,"PASS"); gsub(/FAILED/,"FAIL"); gsub(/SKIPPED/,"SKIP"); if ($NF=="PASS"){print $NF": "$(NF-1)}else{print $NF": "$2}}' | uniq
6 6
diff --git a/meta/recipes-devtools/expect/expect_5.45.4.bb b/meta/recipes-devtools/expect/expect_5.45.4.bb
index 461a2c093a..3d50a8f25a 100644
--- a/meta/recipes-devtools/expect/expect_5.45.4.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.4.bb
@@ -13,8 +13,8 @@ SECTION = "devel"
13 13
14LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c" 14LIC_FILES_CHKSUM = "file://license.terms;md5=fbf2de7e9102505b1439db06fc36ce5c"
15 15
16DEPENDS += "tcl" 16DEPENDS += "tcl8"
17RDEPENDS:${PN} = "tcl" 17RDEPENDS:${PN} = "tcl8"
18 18
19inherit autotools update-alternatives ptest 19inherit autotools update-alternatives ptest
20 20