You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/03/30 13:53:15 UTC
[1/2] lucy-clownfish git commit: Change order of #includes in
generated boot.c
Repository: lucy-clownfish
Updated Branches:
refs/heads/master f7960be90 -> 9900140b3
Change order of #includes in generated boot.c
Some platforms require the bool type to be defined before including the
Perl headers.
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/7e065b2a
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/7e065b2a
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/7e065b2a
Branch: refs/heads/master
Commit: 7e065b2ac1bbff2ae6e90c7d163e857dfb1ff2a8
Parents: f7960be
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Mar 30 13:43:33 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Mar 30 13:43:33 2015 +0200
----------------------------------------------------------------------
compiler/src/CFCPerl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/7e065b2a/compiler/src/CFCPerl.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCPerl.c b/compiler/src/CFCPerl.c
index 6464bdf..a5921d9 100644
--- a/compiler/src/CFCPerl.c
+++ b/compiler/src/CFCPerl.c
@@ -292,17 +292,17 @@ S_write_boot_c(CFCPerl *self) {
const char pattern[] =
"%s\n"
"\n"
+ "#include \"boot.h\"\n"
+ "#include \"Clownfish/String.h\"\n"
+ "#include \"Clownfish/Class.h\"\n"
+ "%s\n"
+ "\n"
"/* Avoid conflicts with Clownfish bool type. */\n"
"#define HAS_BOOL\n"
"#include \"EXTERN.h\"\n"
"#include \"perl.h\"\n"
"#include \"XSUB.h\"\n"
"\n"
- "#include \"boot.h\"\n"
- "#include \"Clownfish/String.h\"\n"
- "#include \"Clownfish/Class.h\"\n"
- "%s\n"
- "\n"
"void\n"
"%s() {\n"
"%s"
[2/2] lucy-clownfish git commit: Fix TAP output when skipping
multiple tests
Posted by nw...@apache.org.
Fix TAP output when skipping multiple tests
Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/9900140b
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/9900140b
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/9900140b
Branch: refs/heads/master
Commit: 9900140b3e05a41560f4936bbe40a9888917a512
Parents: 7e065b2
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Mar 30 13:46:36 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Mar 30 13:46:36 2015 +0200
----------------------------------------------------------------------
runtime/core/Clownfish/TestHarness/TestBatchRunner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/9900140b/runtime/core/Clownfish/TestHarness/TestBatchRunner.c
----------------------------------------------------------------------
diff --git a/runtime/core/Clownfish/TestHarness/TestBatchRunner.c b/runtime/core/Clownfish/TestHarness/TestBatchRunner.c
index aacffa4..7183226 100644
--- a/runtime/core/Clownfish/TestHarness/TestBatchRunner.c
+++ b/runtime/core/Clownfish/TestHarness/TestBatchRunner.c
@@ -278,9 +278,9 @@ TestBatchRunner_VFail_IMP(TestBatchRunner *self, const char *pattern,
void
TestBatchRunner_VSkip_IMP(TestBatchRunner *self, uint32_t num,
const char *pattern, va_list args) {
- self->test_num += num;
- TestFormatter_VTest_Skip(self->formatter, self->test_num, num, pattern,
+ TestFormatter_VTest_Skip(self->formatter, self->test_num + 1, num, pattern,
args);
+ self->test_num += num;
self->num_skipped += num;
}