Skip to content
This repository has been archived by the owner on Mar 29, 2018. It is now read-only.

Commit

Permalink
Undo replacement of __VA_ARGS__ as it breaks when you use variadic me…
Browse files Browse the repository at this point in the history
…thods in your specs
  • Loading branch information
lukeredpath committed Jun 28, 2011
1 parent e085547 commit d1e340c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions Examples/ExampleSpec.m
Expand Up @@ -42,6 +42,7 @@
[cruiser setFighters:[NSArray arrayWithObjects:[Fighter fighterWithCallsign:@"Viper 1"],
[Fighter fighterWithCallsign:@"Viper 2"],
[Fighter fighterWithCallsign:@"Viper 3"], nil]];

});

pending(@"should be really big", nil);
Expand Down
10 changes: 5 additions & 5 deletions Kiwi/KiwiMacros.h
Expand Up @@ -36,16 +36,16 @@
// Kiwi macros used in specs to create example groups. Because these macros
// hide functions of the same name, they can be undefined at the expense of
// getting call site information injected into output messages.
#define describe(desc, blk) describeWithCallSite(KW_THIS_CALLSITE, desc, blk)
#define describe(...) describeWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define context(...) contextWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define registerMatchers(prefix) registerMatchersWithCallSite(KW_THIS_CALLSITE, prefix)
#define registerMatchers(...) registerMatchersWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define beforeAll(...) beforeAllWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define afterAll(...) afterAllWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define beforeEach(...) beforeEachWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define afterEach(...) afterEachWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define it(desc, blk) itWithCallSite(KW_THIS_CALLSITE, desc, blk)
#define pending(desc, blk) pendingWithCallSite(KW_THIS_CALLSITE, desc, blk)
#define xit(desc, blk) pendingWithCallSite(KW_THIS_CALLSITE, desc, blk)
#define it(...) itWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define pending(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)
#define xit(...) pendingWithCallSite(KW_THIS_CALLSITE, __VA_ARGS__)

// user defined matchers
#define registerMatcher(name) \
Expand Down

0 comments on commit d1e340c

Please sign in to comment.