- Timestamp:
- Jun 28, 2016, 3:33:05 PM (10 years ago)
- Branches:
- ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
- Children:
- 982d63f
- Parents:
- e39aa0f (diff), 2e04c7b3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- src/tests
- Files:
-
- 1 added
- 3 edited
- 58 moved
-
.expect/array.txt (moved) (moved from src/tests/.expect/Array.txt )
-
.expect/asmName.txt (moved) (moved from src/tests/.expect/AsmName.txt )
-
.expect/cast.txt (moved) (moved from src/tests/.expect/Cast.txt )
-
.expect/castError.txt (moved) (moved from src/tests/.expect/CastError.txt ) (1 diff)
-
.expect/constant0-1.txt (moved) (moved from src/tests/.expect/Constant0-1.txt )
-
.expect/constant0-1DP.txt (moved) (moved from src/tests/.expect/Constant0-1DP.txt ) (1 diff)
-
.expect/constant0-1ND.txt (moved) (moved from src/tests/.expect/Constant0-1ND.txt )
-
.expect/constant0-1NDDP.txt (moved) (moved from src/tests/.expect/Constant0-1NDDP.txt ) (1 diff)
-
.expect/declarationErrors.txt (moved) (moved from src/tests/.expect/DeclarationErrors.txt ) (1 diff)
-
.expect/declarationSpecifier.txt (moved) (moved from src/tests/.expect/DeclarationSpecifier.txt ) (1 diff)
-
.expect/enum.txt (moved) (moved from src/tests/.expect/Enum.txt )
-
.expect/expression.txt (moved) (moved from src/tests/.expect/Expression.txt )
-
.expect/gccExtensions.txt (moved) (moved from src/tests/.expect/GccExtensions.txt )
-
.expect/identFuncDeclarator.txt (moved) (moved from src/tests/.expect/IdentFuncDeclarator.txt )
-
.expect/identParamDeclarator.txt (moved) (moved from src/tests/.expect/IdentFuncParamDeclarator.txt )
-
.expect/labelledExit.txt (moved) (moved from src/tests/.expect/LabelledExit.txt ) (1 diff)
-
.expect/numericConstants.txt (moved) (moved from src/tests/.expect/NumericConstants.txt )
-
.expect/operators.txt (moved) (moved from src/tests/.expect/Operators.txt )
-
.expect/scopeErrors.txt (moved) (moved from src/tests/.expect/ScopeErrors.txt ) (1 diff)
-
.expect/shortCircuit.txt (moved) (moved from src/tests/.expect/ShortCircuit.txt )
-
.expect/switch.txt (moved) (moved from src/tests/.expect/Switch.txt )
-
.expect/typeof.txt (moved) (moved from src/tests/.expect/Typeof.txt )
-
.expect/variableDeclarator.txt (moved) (moved from src/tests/.expect/VariableDeclarator.txt )
-
Makefile.am (modified) (3 diffs)
-
Makefile.in (modified) (2 diffs)
-
array.c (moved) (moved from src/tests/Array.c )
-
asmName.c (moved) (moved from src/tests/AsmName.c )
-
cast.c (moved) (moved from src/tests/Cast.c )
-
castError.c (moved) (moved from src/tests/CastError.c )
-
charStringConstants.c (moved) (moved from src/tests/CharStringConstants.c )
-
commentMisc.c (moved) (moved from src/tests/CommentMisc.c )
-
constant0-1.c (moved) (moved from src/tests/Constant0-1.c )
-
context.c (moved) (moved from src/tests/Context.c )
-
declarationErrors.c (moved) (moved from src/tests/DeclarationErrors.c )
-
declarationSpecifier.c (moved) (moved from src/tests/DeclarationSpecifier.c )
-
enum.c (moved) (moved from src/tests/Enum.c )
-
exception.c (moved) (moved from src/tests/Exception.c )
-
expression.c (moved) (moved from src/tests/Expression.c )
-
forall.c (moved) (moved from src/tests/Forall.c )
-
functions.c (moved) (moved from src/tests/Functions.c )
-
gccExtensions.c (moved) (moved from src/tests/GccExtensions.c )
-
identFuncDeclarator.c (moved) (moved from src/tests/IdentFuncDeclarator.c )
-
identParamDeclarator.c (moved) (moved from src/tests/IdentFuncParamDeclarator.c )
-
labelledExit.c (moved) (moved from src/tests/LabelledExit.c )
-
namedParmArg.c (moved) (moved from src/tests/NamedParmArg.c )
-
numericConstants.c (moved) (moved from src/tests/NumericConstants.c )
-
occursError.c (moved) (moved from src/tests/OccursError.c )
-
operators.c (moved) (moved from src/tests/Operators.c )
-
quoted_keyword.c (added)
-
scope.c (moved) (moved from src/tests/Scope.c )
-
scopeErrors.c (moved) (moved from src/tests/ScopeErrors.c )
-
shortCircuit.c (moved) (moved from src/tests/ShortCircuit.c )
-
structMember.c (moved) (moved from src/tests/StructMember.c )
-
subrange.c (moved) (moved from src/tests/Subrange.c )
-
switch.c (moved) (moved from src/tests/Switch.c )
-
test.py (modified) (4 diffs)
-
tuples.c (moved) (moved from src/tests/Tuples.c )
-
typeGenerator.c (moved) (moved from src/tests/TypeGenerator.c )
-
typedef.c (moved) (moved from src/tests/Typedef.c ) (2 diffs)
-
typedefDeclarator.c (moved) (moved from src/tests/TypedefDeclarator.c )
-
typeof.c (moved) (moved from src/tests/Typeof.c )
-
variableDeclarator.c (moved) (moved from src/tests/VariableDeclarator.c )
Legend:
- Unmodified
- Added
- Removed
-
src/tests/.expect/castError.txt
re39aa0f r4dcea3f 40 40 41 41 42 make: *** [ CastError] Error 142 make: *** [castError] Error 1 -
src/tests/.expect/constant0-1DP.txt
re39aa0f r4dcea3f 32 32 Error: duplicate object definition for x: const pointer to pointer to signed int 33 33 Error: duplicate object definition for 0: pointer to pointer to signed int 34 make: *** [ Constant0-1DP] Error 134 make: *** [constant0-1DP] Error 1 -
src/tests/.expect/constant0-1NDDP.txt
re39aa0f r4dcea3f 16 16 Error: duplicate object definition for x: const pointer to signed int 17 17 Error: duplicate object definition for 0: const pointer to signed int 18 make: *** [ Constant0-1NDDP] Error 118 make: *** [constant0-1NDDP] Error 1 -
src/tests/.expect/declarationErrors.txt
re39aa0f r4dcea3f 14 14 Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int 15 15 16 make: *** [ DeclarationErrors] Error 116 make: *** [declarationErrors] Error 1 -
src/tests/.expect/declarationSpecifier.txt
re39aa0f r4dcea3f 14 14 Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int 15 15 16 make: *** [ DeclarationSpecifier] Error 116 make: *** [declarationSpecifier] Error 1 -
src/tests/.expect/labelledExit.txt
re39aa0f r4dcea3f 1 1 CFA Version 1.0.0 (debug) 2 2 Error: 'break' outside a loop or switch 3 make: *** [ LabelledExit] Error 13 make: *** [labelledExit] Error 1 -
src/tests/.expect/scopeErrors.txt
re39aa0f r4dcea3f 9 9 CompoundStmt 10 10 11 make: *** [ ScopeErrors] Error 111 make: *** [scopeErrors] Error 1 -
src/tests/Makefile.am
re39aa0f r4dcea3f 11 11 ## Created On : Sun May 31 09:08:15 2015 12 12 ## Last Modified By : Peter A. Buhr 13 ## Last Modified On : Mon Jun 2 0 14:30:52201614 ## Update Count : 3 313 ## Last Modified On : Mon Jun 27 14:39:08 2016 14 ## Update Count : 34 15 15 ############################################################################### 16 16 … … 27 27 28 28 all-local : 29 python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast29 +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast 30 30 31 31 all-tests : 32 python test.py --all32 +python test.py --all 33 33 34 34 clean-local : … … 36 36 37 37 list : 38 python test.py --list38 +python test.py --list 39 39 40 40 constant0-1DP : constant0-1.c -
src/tests/Makefile.in
re39aa0f r4dcea3f 634 634 635 635 all-local : 636 python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast636 +python test.py vector_test avl_test operators numericConstants expression enum asmName array typeof cast 637 637 638 638 all-tests : 639 python test.py --all639 +python test.py --all 640 640 641 641 clean-local : … … 643 643 644 644 list : 645 python test.py --list645 +python test.py --list 646 646 647 647 constant0-1DP : constant0-1.c -
src/tests/test.py
re39aa0f r4dcea3f 61 61 62 62 # build, skipping to next test on error 63 make_ret = sh(" make -j 8 %s 2> %s 1> /dev/null" % (test, out_file), dry_run)63 make_ret = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run) 64 64 65 65 if make_ret == 0 : … … 84 84 85 85 def run_tests(tests, generate, dry_run) : 86 sh( 'make clean > /dev/null 2>&1', dry_run)86 sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run) 87 87 sh('mkdir -p .out .expect', dry_run) 88 88 … … 102 102 print( "Done" ) 103 103 104 sh( 'make clean > /dev/null 2>&1', dry_run)104 sh("%s clean > /dev/null 2>&1" % make_cmd, dry_run) 105 105 106 106 return 1 if failed else 0 … … 141 141 sys.exit(1) 142 142 143 tests.sort() 144 make_flags = environ.get('MAKEFLAGS') 145 make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8" 146 143 147 if options.list : 144 148 print("\n".join(tests)) -
src/tests/typedef.c
re39aa0f r4dcea3f 2 2 3 3 void f( void ) { 4 int T( T );4 int T( T p ) { return 3; } 5 5 T( 3 ); 6 6 } … … 38 38 typedef [ int, int ] tupleType; 39 39 typedef * [ int, int ] tupleTypePtr; 40 typedef * int a, b;40 typedef * int c, d; 41 41 typedef [ int ] f( * int ), g; 42 42 typedef [ * [static 10] int ] t; 43 typedef [ * [static 10] int x ] f();43 typedef [ * [static 10] int x ] h(); 44 44 45 45 // Local Variables: //
Note:
See TracChangeset
for help on using the changeset viewer.