From nobody Wed Sep 21 06:47:18 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MXTVb1Nk2z4cSmG; Wed, 21 Sep 2022 06:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MXTVb0s1Gz3GgN; Wed, 21 Sep 2022 06:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663742839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35xrE7RYV3qDRUyM8nR/chjiphClTheKUcHEyZGNMMg=; b=RpHZ/qxQUY1zOlnZnn+XKlkLCl5idKiTrhIHI54L4fma3MHTvSgsi4av++Wn2Tj08MmV/y y4YzI7roDj02JhuDF8yw1AtqvLV1mGBl9Q0qWdxRyeeXkjbiAP7raW1W0x7Y1nXHmFBFyf XunUR77PSV1cHqIgOwKiSDViUpc+w3MTaio2gKJF/9SBAWuDB6T3YppTO4garRJkRVD9kh lMIx97et7P1WpKyyNzUt6PTXencr/vG6k9EGjx0KRzSsgs+F/evJXz4OG9TKKtY9AMR5MK vPZsl8GreZtl9mbfe6kr+cZf2JK+nFBgfuOEryuk6nmJ9mbNrcx/+9rXMkhXyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MXTVZ6nskzynN; Wed, 21 Sep 2022 06:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28L6lINH052904; Wed, 21 Sep 2022 06:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28L6lIg4052903; Wed, 21 Sep 2022 06:47:18 GMT (envelope-from git) Date: Wed, 21 Sep 2022 06:47:18 GMT Message-Id: <202209210647.28L6lIg4052903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: a6426a69f4be - stable/13 - libc: add test case for qsort_b(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6426a69f4be9cc8f1b0e8d8db4bf0f674c7163c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663742839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=35xrE7RYV3qDRUyM8nR/chjiphClTheKUcHEyZGNMMg=; b=Qmux2Adku0kYfvLBQ2QWtrcsRCAk27clFqKW/HZJS9nNATB/OxZ2R7kJ2FiZrFcoWCi8f5 9xYCkEasDmmbPULk9Ua2zo0ga9gdziu7woz2eJxnTU2i01SPU9VbcjwLJIwAE/AwOZDzP8 I9GGQJhqv6c0UsyKmfBvblWk9fgXRO45Ge5NZtv9/BPM1WwpUKa3gaBXp0NGuJOzp6F7Fw /L5V8KeupVYVddkj7KI17BMsPwvspxVUADbW+gKX1VFwsPeh335RLmtNX1xwv0wQms1VoU 3oDzFaWL8kBYJ3Rlv/qFTIcsf6UD8OBIWrI0JrOT+O60U0b6J7zhZX9VgaiyQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663742839; a=rsa-sha256; cv=none; b=ECxxUczzoWK6Ok3kuBbIRFwjlcW72i/PVQPfGGeswaVXj8J4BXkfLQwCf2OPT2cC80F9X8 dO5SM2r0AHWr6ysplI8VPuq/6VFC3HMmeAs0soMP62veDUZk0ChWlfJUW72f02gvBHy6LV iuMKP44kLdwcFR/OC7Jr6AJmOLzgxXuPz3dPMEil1cckym0ql3xKK+fPEEkjcU+JQr2X/S 6S//RWoFpJGKsHtEc+6RHYQIKIexP1jirIhcfRN8SUuEhZwWELYAqrY8SFkCt2gprWZbDZ 1AMuPcNDMEbIRdEbCZ+fjDUYz9wwDEu1URnzx7K0JmxSgH5gSRdMpJ+BK7iWRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=a6426a69f4be9cc8f1b0e8d8db4bf0f674c7163c commit a6426a69f4be9cc8f1b0e8d8db4bf0f674c7163c Author: Xin LI AuthorDate: 2022-09-07 06:11:46 +0000 Commit: Xin LI CommitDate: 2022-09-21 06:46:48 +0000 libc: add test case for qsort_b(3) Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D36463 (cherry picked from commit c65e42dbde4198ce46aef7ddac061390abe672dc) (cherry picked from commit 4385a9f851bbbb88a4310ebfa929dfab01b6fc4d) --- lib/libc/tests/stdlib/Makefile | 7 ++++ lib/libc/tests/stdlib/qsort_b_test.c | 76 ++++++++++++++++++++++++++++++++++++ share/mk/bsd.libnames.mk | 1 + share/mk/src.libnames.mk | 1 + 4 files changed, 85 insertions(+) diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index bd85efcb1b95..b13b6e9a4fae 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -6,6 +6,7 @@ ATF_TESTS_C+= dynthr_test ATF_TESTS_C+= heapsort_test ATF_TESTS_C+= mergesort_test ATF_TESTS_C+= qsort_test +ATF_TESTS_C+= qsort_b_test ATF_TESTS_C+= qsort_r_test ATF_TESTS_C+= qsort_s_test ATF_TESTS_C+= set_constraint_handler_s_test @@ -58,6 +59,12 @@ CXXSTD.cxa_thread_atexit_test= c++11 CXXSTD.cxa_thread_atexit_nothr_test= c++11 LIBADD.cxa_thread_atexit_test+= pthread +# Tests that requires Blocks feature +.for t in qsort_b_test +CFLAGS.${t}.c+= -fblocks +LIBADD.${t}+= BlocksRuntime +.endfor + .for t in h_getopt h_getopt_long CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR} diff --git a/lib/libc/tests/stdlib/qsort_b_test.c b/lib/libc/tests/stdlib/qsort_b_test.c new file mode 100644 index 000000000000..60cd30ac222a --- /dev/null +++ b/lib/libc/tests/stdlib/qsort_b_test.c @@ -0,0 +1,76 @@ +/*- + * Copyright (C) 2004 Maxim Sobolev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Test for qsort_b() routine. + */ + +#include +#include +#include + +#include "test-sort.h" + +ATF_TC_WITHOUT_HEAD(qsort_b_test); +ATF_TC_BODY(qsort_b_test, tc) +{ + int testvector[IVEC_LEN]; + int sresvector[IVEC_LEN]; + int i, j; + + for (j = 2; j < IVEC_LEN; j++) { + /* Populate test vectors */ + for (i = 0; i < j; i++) + testvector[i] = sresvector[i] = initvector[i]; + + /* Sort using qsort_b(3) */ + qsort_b(testvector, j, sizeof(testvector[0]), + ^(const void* a, const void* b) { + if (*(int *)a > *(int *)b) + return (1); + else if (*(int *)a < *(int *)b) + return (-1); + else + return (0); + }); + /* Sort using reference slow sorting routine */ + ssort(sresvector, j); + + /* Compare results */ + for (i = 0; i < j; i++) + ATF_CHECK_MSG(testvector[i] == sresvector[i], + "item at index %d didn't match: %d != %d", + i, testvector[i], sresvector[i]); + } +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, qsort_b_test); + + return (atf_no_error()); +} diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 818c0d72aa71..a45ed27170a0 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -27,6 +27,7 @@ LIBAVL?= ${LIBDESTDIR}${LIBDIR_BASE}/libavl.a LIBBE?= ${LIBDESTDIR}${LIBDIR_BASE}/libbe.a LIBBEGEMOT?= ${LIBDESTDIR}${LIBDIR_BASE}/libbegemot.a LIBBLACKLIST?= ${LIBDESTDIR}${LIBDIR_BASE}/libblacklist.a +LIBBLOCKSRUNTIME?= ${LIBDESTDIR}${LIBDIR_BASE}/libBlocksRuntime.a LIBBLUETOOTH?= ${LIBDESTDIR}${LIBDIR_BASE}/libbluetooth.a LIBBSDXML?= ${LIBDESTDIR}${LIBDIR_BASE}/libbsdxml.a LIBBSM?= ${LIBDESTDIR}${LIBDIR_BASE}/libbsm.a diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 4a7ad1fcb02f..eaf0fd3e20ee 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -96,6 +96,7 @@ _LIBRARIES= \ archive \ asn1 \ avl \ + BlocksRuntime \ be \ begemot \ bluetooth \