diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /test/.gitignore | |
parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/.gitignore')
-rw-r--r-- | test/.gitignore | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/.gitignore b/test/.gitignore index 776a7e0a0..1e7cd584e 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -3,8 +3,13 @@ # !.gitignore # +# Generated files +# +*.out +# # Executable test # +*_glibc argp/argp-ex[1-4] argp/argp-test argp/bug-argp1 @@ -35,6 +40,7 @@ inet/tst-ethers inet/tst-ethers-line inet/tst-network inet/tst-ntoa +librt/shmtest locale/bug-iconv-trans locale/collate-test locale/dump-ctype @@ -108,7 +114,10 @@ malloc/tst-[cmv]alloc malloc/tst-mallocfork malloc/tst-mcheck malloc/tst-obstack -math/gen-libm-test.pl +math/libm-test-ulps.h +math/libm-test.c +math/test-fpucw +math/tst-definitions misc/bug-glob2 misc/bug-readdir1 misc/dirent @@ -228,6 +237,8 @@ string/tst-strxfrm termios/termios time/clocktest time/test_time +time/tst-ftime_l +time/tst-futimens1 time/tst-mktime time/tst-mktime3 time/tst-strptime2 |