From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.6 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NORMAL_HTTP_TO_IP, NUMERIC_HTTP_ADDR shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id C9ABC1F47C for ; Mon, 9 Jan 2023 00:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1673222468; bh=Rbgx6wuaY7gztTLcgpEIqJ/Cg2RqVCoUiMTohmdfxus=; h=From:To:Subject:Date:From; b=XVuSH2zOhVFXLeYs7xJT6QhCKED2q5QsbHO3ayMD1XQ1yFh7rOknaoefKVTN1pSb3 PiDdpE8wdMwvafgYNHeZOgdK9WL3yvmoSBe9Zn8bTGU3nD3Vl5RJr+MwpV4O32+LWn laOZsqqddxcq19gXvRZQKNSmy6Okz/3TcSMgbaeQ= From: Eric Wong To: mwrap-perl@80x24.org Subject: [PATCH] t/httpd.t: needs sqlite3 3.32.0+ for `.import --csv' Date: Mon, 9 Jan 2023 00:01:09 +0000 Message-Id: <20230109000109.2526156-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Just disable the test if CSV import doesn't work with the currently-installed sqlite3. --- t/httpd.t | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/t/httpd.t b/t/httpd.t index 7746837..8f56f64 100644 --- a/t/httpd.t +++ b/t/httpd.t @@ -135,19 +135,28 @@ SKIP: { SKIP: { skip 'no reset w/o curl --unix-socket', 1 if !$curl_unix; - + my ($sqlite_v) = (`sqlite3 --version` =~ /([\d+\.]+)/); + if ($?) { + diag 'sqlite3 missing or broken'; + $sqlite_v = 0; + } else { + my @v = split(/\./, $sqlite_v); + $sqlite_v = ($v[0] << 16) | ($v[1] << 8) | $v[2]; + diag 'sqlite_v='.sprintf('0x%x', $sqlite_v); + } $rc = system(@curl, "http://0/$pid/each/100.csv"); is($rc, 0, '.csv retrieved') or skip 'CSV failed', 1; my $db = "$mwrap_tmp/t.sqlite3"; - $rc = system(qw(sqlite3), $db, ".import --csv $cout mwrap_each"); - if ($rc == -1) { - diag 'sqlite3 missing'; - } else { + + if ($sqlite_v >= 0x32000) { + $rc = system(qw(sqlite3), $db,".import --csv $cout mwrap_each"); is($rc, 0, 'sqlite3 import'); my $n = `sqlite3 $db 'SELECT COUNT(*) FROM mwrap_each'`; is($?, 0, 'sqlite3 count'); my $exp = split(/\n/, slurp($cout)); is($n + 1, $exp, 'imported all rows into sqlite'); + } else { + diag "sqlite 3.32.0+ needed for `.import --csv'"; } $rc = system(@curl, qw(-d x=y), "http://0/$pid/reset");