From: Jonathan Nieder <jrnieder@gmail.com>
To: git@vger.kernel.org
Cc: David Barr <david.barr@cordelta.com>,
Thomas Rast <trast@student.ethz.ch>,
Ramkumar Ramachandra <artagnon@gmail.com>
Subject: [PATCH 5/8] vcs-svn: make test-line-buffer input format more flexible
Date: Sun, 2 Jan 2011 18:50:16 -0600 [thread overview]
Message-ID: <20110103005016.GB30506@burratino> (raw)
In-Reply-To: <20110103004900.GA30506@burratino>
Imitate the input format of test-obj-pool to support arbitrary
sequences of commands rather than alternating read/copy. This should
make it easier to add tests that exercise other line_buffer functions.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
t/t0080-vcs-svn.sh | 18 ++++++++--------
test-line-buffer.c | 56 +++++++++++++++++++++++++++++++++------------------
2 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/t/t0080-vcs-svn.sh b/t/t0080-vcs-svn.sh
index d3225ad..8be9700 100755
--- a/t/t0080-vcs-svn.sh
+++ b/t/t0080-vcs-svn.sh
@@ -85,40 +85,40 @@ test_expect_success 'line buffer' '
printf "%s\n" "" foo >expected6 &&
test-line-buffer <<-\EOF >actual1 &&
- 5
+ read 5
HELLO
EOF
test-line-buffer <<-\EOF >actual2 &&
- 0
+ read 0
- 5
+ copy 5
HELLO
EOF
q_to_nul <<-\EOF |
- 1
+ read 1
Q
EOF
test-line-buffer >actual3 &&
q_to_nul <<-\EOF |
- 0
+ read 0
- 1
+ copy 1
Q
EOF
test-line-buffer >actual4 &&
test-line-buffer <<-\EOF >actual5 &&
- 5
+ read 5
foo
EOF
test-line-buffer <<-\EOF >actual6 &&
- 0
+ read 0
- 5
+ copy 5
foo
EOF
diff --git a/test-line-buffer.c b/test-line-buffer.c
index f9af892..383f35b 100644
--- a/test-line-buffer.c
+++ b/test-line-buffer.c
@@ -1,11 +1,5 @@
/*
* test-line-buffer.c: code to exercise the svn importer's input helper
- *
- * Input format:
- * number NL
- * (number bytes) NL
- * number NL
- * ...
*/
#include "git-compat-util.h"
@@ -20,28 +14,50 @@ static uint32_t strtouint32(const char *s)
return (uint32_t) n;
}
+static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
+{
+ switch (*command) {
+ case 'c':
+ if (!prefixcmp(command, "copy ")) {
+ buffer_copy_bytes(buf, strtouint32(arg) + 1);
+ return;
+ }
+ case 'r':
+ if (!prefixcmp(command, "read ")) {
+ const char *s = buffer_read_string(buf, strtouint32(arg));
+ printf("%s\n", s);
+ buffer_skip_bytes(buf, 1); /* consume newline */
+ return;
+ }
+ default:
+ die("unrecognized command: %s", command);
+ }
+}
+
+static void handle_line(const char *line, struct line_buffer *stdin_buf)
+{
+ const char *arg = strchr(line, ' ');
+ if (!arg)
+ die("no argument in line: %s", line);
+ handle_command(line, arg + 1, stdin_buf);
+}
+
int main(int argc, char *argv[])
{
- struct line_buffer buf = LINE_BUFFER_INIT;
+ struct line_buffer stdin_buf = LINE_BUFFER_INIT;
char *s;
if (argc != 1)
- usage("test-line-buffer < input.txt");
- if (buffer_init(&buf, NULL))
+ usage("test-line-buffer < script");
+
+ if (buffer_init(&stdin_buf, NULL))
die_errno("open error");
- while ((s = buffer_read_line(&buf))) {
- s = buffer_read_string(&buf, strtouint32(s));
- fputs(s, stdout);
- fputc('\n', stdout);
- buffer_skip_bytes(&buf, 1);
- if (!(s = buffer_read_line(&buf)))
- break;
- buffer_copy_bytes(&buf, strtouint32(s) + 1);
- }
- if (buffer_deinit(&buf))
+ while ((s = buffer_read_line(&stdin_buf)))
+ handle_line(s, &stdin_buf);
+ if (buffer_deinit(&stdin_buf))
die("input error");
if (ferror(stdout))
die("output error");
- buffer_reset(&buf);
+ buffer_reset(&stdin_buf);
return 0;
}
--
1.7.4.rc0.580.g89dc.dirty
next prev parent reply other threads:[~2011-01-03 0:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-24 8:05 [PATCH 0/4] teach vcs-svn/line_buffer to handle multiple input files Jonathan Nieder
2010-12-24 8:08 ` [PATCH 1/4] vcs-svn: eliminate global byte_buffer Jonathan Nieder
2010-12-24 8:17 ` [PATCH 2/4] vcs-svn: replace buffer_read_string memory pool with a strbuf Jonathan Nieder
2010-12-24 8:18 ` [PATCH 3/4] vcs-svn: collect line_buffer data in a struct Jonathan Nieder
2010-12-24 8:28 ` [PATCH 4/4] vcs-svn: teach line_buffer to handle multiple input files Jonathan Nieder
2011-01-03 0:49 ` [PATCH 0/4] teach vcs-svn/line_buffer " Jonathan Nieder
2011-01-03 0:50 ` Jonathan Nieder [this message]
2011-01-03 0:51 ` [PATCH 6/8] tests: give vcs-svn/line_buffer its own test script Jonathan Nieder
2011-01-03 0:52 ` [PATCH 7/8] vcs-svn: tweak test-line-buffer to not assume line-oriented input Jonathan Nieder
2011-01-03 1:07 ` [PATCH 8/8] t0081 (line-buffer): add buffering tests Jonathan Nieder
2011-01-03 1:34 ` Jonathan Nieder
2011-01-03 3:03 ` [PATCHES 9-12/12] line_buffer: more wrappers around stdio functions Jonathan Nieder
2011-01-03 3:05 ` [PATCH 09/12] vcs-svn: add binary-safe read function Jonathan Nieder
2011-01-03 3:06 ` [PATCH 10/12] vcs-svn: allow character-oriented input Jonathan Nieder
2011-01-03 3:09 ` [PATCH 11/12] vcs-svn: allow input from file descriptor Jonathan Nieder
2011-01-03 3:10 ` [PATCH 12/12] vcs-svn: teach line_buffer about temporary files Jonathan Nieder
2011-01-22 6:42 ` [FYI/PATCH] vcs-svn: give control over temporary file names Jonathan Nieder
2011-02-26 11:44 ` [PULL svn-fe] fast-import 'ls', line-buffer changes Jonathan Nieder
2011-02-26 12:03 ` David Michael Barr
2011-02-28 6:15 ` Junio C Hamano
2011-02-28 21:32 ` [PATCH svn-fe] fast-import: make code "-Wpointer-arith" clean Jonathan Nieder
2011-02-28 21:36 ` Sverre Rabbelier
2011-02-28 22:05 ` Junio C Hamano
2011-02-28 23:15 ` Jonathan Nieder
2011-03-01 0:41 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110103005016.GB30506@burratino \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=david.barr@cordelta.com \
--cc=git@vger.kernel.org \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).