merges 1
This commit is contained in:
parent
a0e2faf480
commit
a75a5c9706
|
@ -305,7 +305,6 @@ def GenerateFile(path, content):
|
||||||
overwrites it with the given content.
|
overwrites it with the given content.
|
||||||
"""
|
"""
|
||||||
print 'Updating file %s . . .' % path
|
print 'Updating file %s . . .' % path
|
||||||
|
|
||||||
f = file(path, 'w+')
|
f = file(path, 'w+')
|
||||||
print >>f, content,
|
print >>f, content,
|
||||||
f.close()
|
f.close()
|
||||||
|
@ -428,7 +427,7 @@ def TestsForArity(n):
|
||||||
}
|
}
|
||||||
|
|
||||||
tests = (
|
tests = (
|
||||||
"""// Sample functions/functors for testing %(arity)s predicate assertions.
|
"""// Sample functions/functors for testing %(arity)s predicate assertions.
|
||||||
|
|
||||||
// A %(arity)s predicate function.
|
// A %(arity)s predicate function.
|
||||||
template <%(types)s>
|
template <%(types)s>
|
||||||
|
@ -589,7 +588,7 @@ typedef Predicate%(n)sTest ASSERT_PRED%(n)sTest;
|
||||||
|
|
||||||
if use_assert:
|
if use_assert:
|
||||||
assrt = 'ASSERT' # 'assert' is reserved, so we cannot use
|
assrt = 'ASSERT' # 'assert' is reserved, so we cannot use
|
||||||
# that identifier here.
|
# that identifier here.
|
||||||
else:
|
else:
|
||||||
assrt = 'EXPECT'
|
assrt = 'EXPECT'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user