diff options
| author | Chi Xu <chi.xu@windriver.com> | 2023-10-17 10:19:17 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-10-17 21:42:56 -0700 |
| commit | 92038e03ee601f140822e252c158960a49225cad (patch) | |
| tree | e9071bcea70732dac914c7bcfecb30151097fa53 /meta-oe | |
| parent | 4079e922845fcdb1f0cc360483daad8cb3ea66d3 (diff) | |
| download | meta-openembedded-92038e03ee601f140822e252c158960a49225cad.tar.gz | |
re2: Add ptest support
Test results:
root@qemux86-64:~# ptest-runner re2 -t 7200
START: ptest-runner
2023-10-16T08:36
BEGIN: /usr/lib/re2/ptest
PASS: charclass_test
PASS: compile_test
PASS: filtered_re2_test
PASS: mimics_pcre_test
PASS: parse_test
PASS: possible_match_test
PASS: re2_test
PASS: re2_arg_test
PASS: regexp_test
PASS: required_prefix_test
PASS: search_test
PASS: set_test
PASS: simplify_test
PASS: string_generator_test
PASS: dfa_test
PASS: exhaustive1_test
PASS: exhaustive2_test
PASS: exhaustive3_test
PASS: exhaustive_test
PASS: random_test
DURATION: 2085
END: /usr/lib/re2/ptest
2023-10-16T09:11
STOP: ptest-runner
TOTAL: 1 FAIL: 0
And add re2 ptest to PTESTS_SLOW_META_OE.
Signed-off-by: Chi Xu <chi.xu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-support/re2/re2/run-ptest | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-support/re2/re2_2023.03.01.bb | 16 |
3 files changed, 17 insertions, 3 deletions
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 212b90c868..bab9d4372c 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc | |||
| @@ -50,6 +50,7 @@ PTESTS_SLOW_META_OE = "\ | |||
| 50 | libusb-compat \ | 50 | libusb-compat \ |
| 51 | rsyslog \ | 51 | rsyslog \ |
| 52 | mariadb \ | 52 | mariadb \ |
| 53 | re2 \ | ||
| 53 | " | 54 | " |
| 54 | PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest" | 55 | PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest" |
| 55 | PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest" | 56 | PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest" |
diff --git a/meta-oe/recipes-support/re2/re2/run-ptest b/meta-oe/recipes-support/re2/re2/run-ptest new file mode 100644 index 0000000000..8bd5fd1efb --- /dev/null +++ b/meta-oe/recipes-support/re2/re2/run-ptest | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | |||
| 3 | ctest --force-new-ctest-process | sed -u 's/\*\*\*/ /g' | awk '/Test +#/{gsub(/Passed/,"PASS"); gsub(/Failed/,"FAIL"); gsub(/Skipped/,"SKIP"); print $6": "$4; fflush();}' | ||
diff --git a/meta-oe/recipes-support/re2/re2_2023.03.01.bb b/meta-oe/recipes-support/re2/re2_2023.03.01.bb index 78bf695a4a..fe210d5107 100644 --- a/meta-oe/recipes-support/re2/re2_2023.03.01.bb +++ b/meta-oe/recipes-support/re2/re2_2023.03.01.bb | |||
| @@ -6,17 +6,27 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b5c31eb512bdf3cb11ffd5713963760" | |||
| 6 | # tag 2023-03-01 | 6 | # tag 2023-03-01 |
| 7 | SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" | 7 | SRCREV = "241e2e430836e80f93d704d1f06cd3e7fe3100f5" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https" | 9 | SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \ |
| 10 | ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ | ||
| 11 | " | ||
| 10 | 12 | ||
| 11 | S = "${WORKDIR}/git" | 13 | S = "${WORKDIR}/git" |
| 12 | 14 | ||
| 13 | inherit cmake | 15 | inherit cmake ptest |
| 16 | RDEPENDS:${PN}-ptest += "cmake sed" | ||
| 14 | 17 | ||
| 15 | EXTRA_OECMAKE += " \ | 18 | EXTRA_OECMAKE += " \ |
| 16 | -DBUILD_SHARED_LIBS=ON \ | 19 | -DBUILD_SHARED_LIBS=ON \ |
| 17 | -DRE2_BUILD_TESTING=OFF \ | 20 | ${@bb.utils.contains('PTEST_ENABLED', '1', '-DRE2_BUILD_TESTING=ON', '-DRE2_BUILD_TESTING=OFF', d)} \ |
| 18 | " | 21 | " |
| 19 | 22 | ||
| 23 | do_install_ptest () { | ||
| 24 | cp -r ${B}/*_test ${D}${PTEST_PATH} | ||
| 25 | cp -r ${B}/CTestTestfile.cmake ${D}${PTEST_PATH} | ||
| 26 | sed -i -e 's#${B}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 27 | sed -i -e 's#${S}#${PTEST_PATH}#g' `find ${D}${PTEST_PATH} -name CTestTestfile.cmake` | ||
| 28 | } | ||
| 29 | |||
| 20 | # ignore .so in /usr/lib64 | 30 | # ignore .so in /usr/lib64 |
| 21 | FILES:${PN} = "${libdir}" | 31 | FILES:${PN} = "${libdir}" |
| 22 | INSANE_SKIP:${PN} += "dev-so" | 32 | INSANE_SKIP:${PN} += "dev-so" |
