@@ -16,11 +16,14 @@ ext_task :thin_backend ragel_task 'ext/thin_backend', 'parser.rl', 'parser.c' task :test do - cd 'test' do - sh 'make test' - end + cd('test') { sh 'make test' } end +task 'test:clean' do + cd('test') { sh 'make clean' } +end +task :clean => 'test:clean' + Spec::Rake::SpecTask.new(:spec) do |t| t.spec_opts = %w(-fs -c) t.spec_files = FileList['spec/**/*_spec.rb'] Rakefile @@ -6,7 +6,7 @@ void buffer_init(buffer_t *buf) { buf->ptr = palloc(buffer_pool(), 1); buf->nalloc = 1; - buf->salloc = 0; + buf->salloc = BUFFER_CHUNK_SIZE; buf->len = 0; buf->offset = 0; buf->file.fd = -1; ext/thin_backend/buffer.c @@ -5,24 +5,19 @@ test_init(); void test_buffer_init(void) { - pool_t *p = pool_create(10, 512); buffer_t b; - buffer_init(&b, p); + buffer_init(&b); - assert_equal(p, b.pool); assert_equal(1, b.nalloc); - assert_equal(512, b.salloc); - - pool_destroy(p); + assert_equal(BUFFER_CHUNK_SIZE, b.salloc); } void test_buffer_append(void) { - pool_t *p = pool_create(10, 1024); buffer_t b; - buffer_init(&b, p); + buffer_init(&b); buffer_append(&b, "hi", 2); assert_str_equal("hi", b.ptr); @@ -31,16 +26,13 @@ void test_buffer_append(void) assert_str_equal("hi you", b.ptr); assert_equal(6, b.len); assert_equal(1, b.nalloc); - - pool_destroy(p); } void test_buffer_grow_and_append(void) { - pool_t *p = pool_create(10, 2); buffer_t b; - buffer_init(&b, p); + buffer_init(&b); buffer_append(&b, "hi", 2); assert_equal(1, b.nalloc); @@ -57,19 +49,14 @@ void test_buffer_grow_and_append(void) assert_equal(8, b.salloc); assert_str_equal("hi you ! ", b.ptr); - - pool_destroy(p); } -void test_buffer_free(void) +void test_buffer_reset(void) { - pool_t *p = pool_create(10, 2); - buffer_t b; - - buffer_init(&b, p); - buffer_free(&b); + buffer_t b; - pool_destroy(p); + buffer_init(&b); + buffer_reset(&b); } int main(int argc, char const *argv[]) @@ -79,7 +66,7 @@ int main(int argc, char const *argv[]) test_buffer_init(); test_buffer_append(); test_buffer_grow_and_append(); - test_buffer_free(); + test_buffer_reset(); test_end(); } \ No newline at end of file test/buffer_test.c 283ca929a6bebdf975fdda9291964a432af96f6d macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin-turbo/commit/f9b793e44e042879c4636df031f9edbb80ebbc5e f9b793e44e042879c4636df031f9edbb80ebbc5e 2008-04-26T20:47:12-07:00 2008-04-26T20:47:12-07:00 Fix a couple buffer_test failures 7031aac7969f136c50ae7e3eda1221f373563a28 macournoyer macournoyer@gmail.com