From patchwork Sat Apr 7 14:40:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 26638 Received: (qmail 103071 invoked by alias); 7 Apr 2018 14:40:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 102670 invoked by uid 89); 7 Apr 2018 14:40:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: barracuda.ebox.ca Received: from barracuda.ebox.ca (HELO barracuda.ebox.ca) (96.127.255.19) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 07 Apr 2018 14:40:49 +0000 X-ASG-Debug-ID: 1523112047-0c856e61898abfb0001-fS2M51 Received: from smtp.ebox.ca (smtp.electronicbox.net [96.127.255.82]) by barracuda.ebox.ca with ESMTP id GaDkHeGVsV0ufbPE (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 07 Apr 2018 10:40:48 -0400 (EDT) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.lan (unknown [192.222.164.54]) by smtp.ebox.ca (Postfix) with ESMTP id D4944441B21; Sat, 7 Apr 2018 10:40:47 -0400 (EDT) From: Simon Marchi X-Barracuda-Effective-Source-IP: 192-222-164-54.qc.cable.ebox.net[192.222.164.54] X-Barracuda-Apparent-Source-IP: 192.222.164.54 X-Barracuda-RBL-IP: 192.222.164.54 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2] Add selftests for range_contains and insert_into_bit_range_vector Date: Sat, 7 Apr 2018 10:40:46 -0400 X-ASG-Orig-Subj: [PATCH v2] Add selftests for range_contains and insert_into_bit_range_vector Message-Id: <20180407144046.20223-1-simon.marchi@polymtl.ca> In-Reply-To: <20180407143801.19596-1-simon.marchi@polymtl.ca> References: <20180407143801.19596-1-simon.marchi@polymtl.ca> X-Barracuda-Connect: smtp.electronicbox.net[96.127.255.82] X-Barracuda-Start-Time: 1523112048 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 4791 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.49668 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-IsSubscribed: yes [Oops, I had some formatting fixes not committed, here's an updated version] I had a patch that converted struct value's VEC into std::vector (as was done recently by Tom), and had added some selftests to make sure I didn't mess things up. I thought that since they're already written I might as well post them. gdb/ChangeLog: * value.c: Include "selftest.h". (test_range_contains): New. (check_ranges_vector): New. (test_insert_into_bit_range_vector): New. (_initialize_values): Register selftests. --- gdb/value.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 132 insertions(+) diff --git a/gdb/value.c b/gdb/value.c index 3d6595f9509d..7101e289d48f 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -41,6 +41,7 @@ #include "user-regs.h" #include #include "completer.h" +#include "selftest.h" /* Definition of a user function. */ struct internal_function @@ -3903,6 +3904,132 @@ isvoid_internal_fn (struct gdbarch *gdbarch, return value_from_longest (builtin_type (gdbarch)->builtin_int, ret); } +namespace selftests +{ +static void test_range_contains (void) +{ + std::vector ranges; + range r; + + /* [10, 14] */ + r.offset = 10; + r.length = 5; + ranges.push_back (r); + + /* [20, 24] */ + r.offset = 20; + r.length = 5; + ranges.push_back (r); + + /* [2, 6] */ + SELF_CHECK (!ranges_contain (ranges, 2, 5)); + /* [9, 13] */ + SELF_CHECK (ranges_contain (ranges, 9, 5)); + /* [10, 11] */ + SELF_CHECK (ranges_contain (ranges, 10, 2)); + /* [10, 14] */ + SELF_CHECK (ranges_contain (ranges, 10, 5)); + /* [13, 18] */ + SELF_CHECK (ranges_contain (ranges, 13, 6)); + /* [14, 18] */ + SELF_CHECK (ranges_contain (ranges, 14, 5)); + /* [15, 18] */ + SELF_CHECK (!ranges_contain (ranges, 15, 4)); + /* [16, 19] */ + SELF_CHECK (!ranges_contain (ranges, 16, 4)); + /* [16, 21] */ + SELF_CHECK (ranges_contain (ranges, 16, 6)); + /* [21, 21] */ + SELF_CHECK (ranges_contain (ranges, 21, 1)); + /* [21, 25] */ + SELF_CHECK (ranges_contain (ranges, 21, 5)); + /* [26, 28] */ + SELF_CHECK (!ranges_contain (ranges, 26, 3)); +} + +/* Check that RANGES contains the expected ranges. EXPECTED_N is the expected + length of RANGES. The variable arguments are pairs of OFFSET/LENGTH + corresponding to the expected ranges. */ + +static bool check_ranges_vector (const std::vector &ranges, + int expected_n, ...) +{ + if (expected_n != ranges.size ()) + return false; + + va_list vl; + va_start (vl, expected_n); + + bool ret = true; + for (const range &r : ranges) + { + LONGEST offset = va_arg (vl, LONGEST); + LONGEST length = va_arg (vl, LONGEST); + + if (r.offset != offset || r.length != length) + { + ret = false; + break; + } + } + + va_end (vl); + + return ret; +} + +static void test_insert_into_bit_range_vector (void) +{ + std::vector ranges; + + /* [10, 14] */ + insert_into_bit_range_vector (&ranges, 10, 5); + SELF_CHECK (check_ranges_vector (ranges, 1, + 10, 5)); + + /* [10, 14] */ + insert_into_bit_range_vector (&ranges, 11, 4); + SELF_CHECK (check_ranges_vector (ranges, 1, + 10, 5)); + + /* [10, 14] [20, 24] */ + insert_into_bit_range_vector (&ranges, 20, 5); + SELF_CHECK (check_ranges_vector (ranges, 2, + 10, 5, + 20, 5)); + + /* [10, 14] [17, 24] */ + insert_into_bit_range_vector (&ranges, 17, 5); + SELF_CHECK (check_ranges_vector (ranges, 2, + 10, 5, + 17, 8)); + + /* [2, 8] [10, 14] [17, 24] */ + insert_into_bit_range_vector (&ranges, 2, 7); + SELF_CHECK (check_ranges_vector (ranges, 3, + 2, 7, + 10, 5, + 17, 8)); + + /* [2, 14] [17, 24] */ + insert_into_bit_range_vector (&ranges, 9, 1); + SELF_CHECK (check_ranges_vector (ranges, 2, + 2, 13, + 17, 8)); + + /* [2, 14] [17, 24] */ + insert_into_bit_range_vector (&ranges, 9, 1); + SELF_CHECK (check_ranges_vector (ranges, 2, + 2, 13, + 17, 8)); + + /* [2, 33] */ + insert_into_bit_range_vector (&ranges, 4, 30); + SELF_CHECK (check_ranges_vector (ranges, 1, + 2, 32)); +} +} /* namespace selftests */ + void _initialize_values (void) { @@ -3954,4 +4081,9 @@ prevents future values, larger than this size, from being allocated."), set_max_value_size, show_max_value_size, &setlist, &showlist); +#if GDB_SELF_TEST + selftests::register_test ("range_contains", selftests::test_range_contains); + selftests::register_test ("insert_into_bit_range_vector", + selftests::test_insert_into_bit_range_vector); +#endif }