diff -Nru cowdancer-0.65ubuntu1/debian/changelog cowdancer-0.66/debian/changelog --- cowdancer-0.65ubuntu1/debian/changelog 2011-11-11 14:57:29.000000000 +0000 +++ cowdancer-0.66/debian/changelog 2011-12-04 13:47:05.000000000 +0000 @@ -1,11 +1,13 @@ -cowdancer (0.65ubuntu1) precise; urgency=low +cowdancer (0.66) unstable; urgency=low - * Fix link order to list libraries after the objects that require them. - * Use -pthread rather than -lpthread, since it should be a superset, it's - what's recommended in pthread_create(3), and it isn't so sensitive to - link order. + [ Colin Watson ] + * Bug#648438: cowdancer: FTBFS with ld that defaults to --as-needed: + bad link order - -- Colin Watson Fri, 11 Nov 2011 14:57:27 +0000 + [ Junichi Uekawa ] + * note down where 573126 happens. + + -- Junichi Uekawa Sun, 04 Dec 2011 22:44:38 +0900 cowdancer (0.65) unstable; urgency=low diff -Nru cowdancer-0.65ubuntu1/debian/control cowdancer-0.66/debian/control --- cowdancer-0.65ubuntu1/debian/control 2011-11-11 14:33:25.000000000 +0000 +++ cowdancer-0.66/debian/control 2011-09-22 02:00:37.000000000 +0000 @@ -1,8 +1,7 @@ Source: cowdancer Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Junichi Uekawa +Maintainer: Junichi Uekawa Build-Depends: debhelper (>> 4.0.0), pbuilder, qemu [i386 amd64 powerpc], libklibc-dev, klibc-utils, cpio, busybox-static Standards-Version: 3.7.2 diff -Nru cowdancer-0.65ubuntu1/parameter.c cowdancer-0.66/parameter.c --- cowdancer-0.65ubuntu1/parameter.c 2011-07-29 13:18:52.000000000 +0000 +++ cowdancer-0.66/parameter.c 2011-12-04 13:32:10.000000000 +0000 @@ -28,8 +28,8 @@ #include "parameter.h" #include -/* - +/* + The pbuilder command-line to pass 0: pbuilder @@ -44,7 +44,7 @@ int offset=2; -/* +/* get size of Null Terminated array of strings */ int size_of_ntarray(char ** buf) @@ -61,7 +61,7 @@ * load configuration. * * Returns bash return codes or -1 on popen error. - * + * * Most interesting codes: * -1 = popen failed * 0 = ok @@ -180,7 +180,7 @@ { /* dump configuration */ int i; - + printf("dump config\n"); #define DUMPINT(S) printf(" "#S": %i\n", pc->S); #define DUMPSTR(S) printf(" "#S": %s\n", pc->S); @@ -208,9 +208,9 @@ DUMPINT(binary_arch); DUMPSTRARRAY(inputfile); DUMPSTRARRAY(outputfile); - + DUMPINT(no_cowdancer_update); - + DUMPSTR(kernel_image); DUMPSTR(initrd); DUMPINT(memory_megs); @@ -218,7 +218,7 @@ return 0; } -int parse_parameter(int ac, char** av, +int parse_parameter(int ac, char** av, const char* keyword) { int c; /* option */ @@ -226,7 +226,7 @@ int config_ok = -1, load_ok; char * cmdstr=NULL; static pbuilderconfig pc; - + static struct option long_options[]= { {"basepath", required_argument, 0, 'b'}, @@ -488,7 +488,7 @@ } /* set default values */ - if (!pc.basepath) + if (!pc.basepath) asprintf(&(pc.basepath), "/var/cache/pbuilder/base.%s", keyword); if (!pc.buildplace) { @@ -499,6 +499,7 @@ { char* buildplace_ = pc.buildplace; mkdir(buildplace_,0777); /* create if it does not exist */ + /* Bug: 573126 This adds '//' if buildplace already ends with / */ asprintf(&(pc.buildplace), "%s/%s.%i", buildplace_, keyword, (int)getpid()); free(buildplace_); @@ -506,7 +507,7 @@ if (!pc.distribution) pc.distribution=strdup("sid"); - + if (!pc.memory_megs) pc.memory_megs=128; @@ -519,9 +520,9 @@ fprintf(stderr, "E: parameter missing for build operation\n"); return 1; } - + return cpbuilder_build(&pc, av[optind]); - + case pbuilder_create: if (av[optind]) { @@ -530,7 +531,7 @@ return 1; } return cpbuilder_create(&pc); - + case pbuilder_update: if (av[optind]) { @@ -539,7 +540,7 @@ return 1; } return cpbuilder_update(&pc); - + case pbuilder_login: return cpbuilder_login(&pc); diff -Nru cowdancer-0.65ubuntu1/tests/log/000_test_basic.sh.log cowdancer-0.66/tests/log/000_test_basic.sh.log --- cowdancer-0.65ubuntu1/tests/log/000_test_basic.sh.log 2011-09-22 02:27:11.000000000 +0000 +++ cowdancer-0.66/tests/log/000_test_basic.sh.log 2011-12-04 13:37:48.000000000 +0000 @@ -4,9 +4,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 7.0959e-05 秒、 14.4 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000134375 s, 7.6 MB/s + ls -li 1/ + sleep 1s + cp -al 1/ 2 @@ -14,25 +14,25 @@ 2/ before + ls -li 2/ 合計 4 -84657 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -84658 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b -84659 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c -84660 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -84661 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e -+ echo 'cd 2 && echo a > a && mv b c && touch c && dd if=e of=d' +349456 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349457 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 b +349458 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 c +349459 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349460 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + cow-shell -Invoking /bin/sh -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 8.9397e-05 秒、 11.5 MB/秒 ++ echo 'cd 2 && echo a > a && mv b c && touch c && dd if=e of=d' +Invoking /bin/bash +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000143315 s, 7.1 MB/s + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -84693 -rw-r--r-- 1 dancer dancer 2 9月 22 11:27 a -84710 -rw-r--r-- 1 dancer dancer 0 9月 22 11:27 c -84711 -rw-r--r-- 1 dancer dancer 1024 9月 22 11:27 d -84661 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349501 -rw-r--r-- 1 dancer dancer 2 2011-12-04 22:37 a +349505 -rw-r--r-- 1 dancer dancer 0 2011-12-04 22:37 c +349509 -rw-r--r-- 1 dancer dancer 1024 2011-12-04 22:37 d +349460 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/001_test_symlink.sh.log cowdancer-0.66/tests/log/001_test_symlink.sh.log --- cowdancer-0.65ubuntu1/tests/log/001_test_symlink.sh.log 2011-09-22 02:27:13.000000000 +0000 +++ cowdancer-0.66/tests/log/001_test_symlink.sh.log 2011-12-04 13:37:50.000000000 +0000 @@ -4,9 +4,9 @@ + mkdir 1/ + touch 1/b 1/c 1/d 1/a.real + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 8.0178e-05 秒、 12.8 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000135213 s, 7.6 MB/s + ln -s a.real 1/a + ls -li 1/ + sleep 1s @@ -15,27 +15,27 @@ 2/ before + ls -li 2/ 合計 4 -84773 lrwxrwxrwx 2 dancer dancer 6 9月 22 11:27 a -> a.real -84771 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a.real -84768 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b -84769 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c -84770 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -84772 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e -+ echo 'cd 2 && echo a > a && mv b c && touch c && dd if=e of=d' +349570 lrwxrwxrwx 1 dancer dancer 6 2011-12-04 22:37 a -> a.real +349543 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a.real +349540 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 b +349541 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 c +349542 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349544 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + cow-shell -Invoking /bin/sh -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 8.6045e-05 秒、 11.9 MB/秒 ++ echo 'cd 2 && echo a > a && mv b c && touch c && dd if=e of=d' +Invoking /bin/bash +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000154838 s, 6.6 MB/s + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -84773 lrwxrwxrwx 2 dancer dancer 6 9月 22 11:27 a -> a.real -84837 -rw-r--r-- 1 dancer dancer 2 9月 22 11:27 a.real -84838 -rw-r--r-- 1 dancer dancer 0 9月 22 11:27 c -84839 -rw-r--r-- 1 dancer dancer 1024 9月 22 11:27 d -84772 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349570 lrwxrwxrwx 1 dancer dancer 6 2011-12-04 22:37 a -> a.real +349587 -rw-r--r-- 1 dancer dancer 2 2011-12-04 22:37 a.real +349588 -rw-r--r-- 1 dancer dancer 0 2011-12-04 22:37 c +349589 -rw-r--r-- 1 dancer dancer 1024 2011-12-04 22:37 d +349544 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/002_test_open.sh.log cowdancer-0.66/tests/log/002_test_open.sh.log --- cowdancer-0.65ubuntu1/tests/log/002_test_open.sh.log 2011-09-22 02:27:15.000000000 +0000 +++ cowdancer-0.66/tests/log/002_test_open.sh.log 2011-12-04 13:37:54.000000000 +0000 @@ -8,9 +8,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 6.8724e-05 秒、 14.9 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000117263 s, 8.7 MB/s + ls -li 1/ + sleep 1s + cp -al 1/ 2 @@ -18,21 +18,21 @@ 2/ before + ls -li 2/ 合計 4 -84907 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -84908 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b -84909 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c -84910 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -84911 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349627 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349628 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 b +349629 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 c +349630 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349631 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/002_test_open.c 2/a 2/b 2/c + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -84907 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -84982 -rw-r--r-- 1 dancer dancer 3 9月 22 11:27 b -84983 -rw-r--r-- 1 dancer dancer 3 9月 22 11:27 c -84910 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -84911 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349627 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349764 -rw-r--r-- 1 dancer dancer 3 2011-12-04 22:37 b +349767 -rw-r--r-- 1 dancer dancer 3 2011-12-04 22:37 c +349630 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349631 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/003_test_fopen.sh.log cowdancer-0.66/tests/log/003_test_fopen.sh.log --- cowdancer-0.65ubuntu1/tests/log/003_test_fopen.sh.log 2011-09-22 02:27:17.000000000 +0000 +++ cowdancer-0.66/tests/log/003_test_fopen.sh.log 2011-12-04 13:37:57.000000000 +0000 @@ -8,9 +8,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 6.6978e-05 秒、 15.3 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000132349 s, 7.7 MB/s + ls -li 1/ + sleep 1s + cp -al 1/ 2 @@ -18,21 +18,21 @@ 2/ before + ls -li 2/ 合計 4 -85033 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -85034 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b -85035 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c -85036 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -85037 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349814 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349815 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 b +349816 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 c +349817 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349818 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/003_test_fopen.c 2/a 2/b 2/c + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -85033 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -85087 -rw-r--r-- 1 dancer dancer 4 9月 22 11:27 b -85088 -rw-r--r-- 1 dancer dancer 4 9月 22 11:27 c -85036 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -85037 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349814 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349906 -rw-r--r-- 1 dancer dancer 4 2011-12-04 22:37 b +349907 -rw-r--r-- 1 dancer dancer 4 2011-12-04 22:37 c +349817 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349818 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/004_test_fopen64.sh.log cowdancer-0.66/tests/log/004_test_fopen64.sh.log --- cowdancer-0.65ubuntu1/tests/log/004_test_fopen64.sh.log 2011-09-22 02:27:19.000000000 +0000 +++ cowdancer-0.66/tests/log/004_test_fopen64.sh.log 2011-12-04 13:38:01.000000000 +0000 @@ -8,9 +8,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 5.3638e-05 秒、 19.1 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000112095 s, 9.1 MB/s + ls -li 1/ + sleep 1s + cp -al 1/ 2 @@ -18,21 +18,21 @@ 2/ before + ls -li 2/ 合計 4 -85115 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -85116 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b -85117 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c -85118 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -85119 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349933 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +349934 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 b +349935 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 c +349936 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349937 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/004_test_fopen64.c 2/a 2/b 2/c + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -85115 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a -85169 -rw-r--r-- 1 dancer dancer 4 9月 22 11:27 b -85170 -rw-r--r-- 1 dancer dancer 4 9月 22 11:27 c -85118 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d -85119 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +349933 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 a +350030 -rw-r--r-- 1 dancer dancer 4 2011-12-04 22:38 b +350039 -rw-r--r-- 1 dancer dancer 4 2011-12-04 22:38 c +349936 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:37 d +349937 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:37 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/010_test_noilistfile.sh.log cowdancer-0.66/tests/log/010_test_noilistfile.sh.log --- cowdancer-0.65ubuntu1/tests/log/010_test_noilistfile.sh.log 2011-09-22 02:27:19.000000000 +0000 +++ cowdancer-0.66/tests/log/010_test_noilistfile.sh.log 2011-12-04 13:38:01.000000000 +0000 @@ -1,8 +1,8 @@ env var COWDANCER_ILISTFILE not defined cowdancer: Fatal, initialize_functions failed env var COWDANCER_ILISTFILE not defined -dd: `/dev/zero' を開いています: メモリを確保できません +dd: opening `/dev/zero': メモリを確保できません cowdancer: cannot open ilistfile ./nonexistent-file cowdancer: Fatal, initialize_functions failed cowdancer: cannot open ilistfile ./nonexistent-file -dd: `/dev/zero' を開いています: メモリを確保できません +dd: opening `/dev/zero': メモリを確保できません diff -Nru cowdancer-0.65ubuntu1/tests/log/012_test_chown.sh.log cowdancer-0.66/tests/log/012_test_chown.sh.log --- cowdancer-0.65ubuntu1/tests/log/012_test_chown.sh.log 2011-09-22 02:27:19.000000000 +0000 +++ cowdancer-0.66/tests/log/012_test_chown.sh.log 2011-12-04 13:38:04.000000000 +0000 @@ -5,11 +5,46 @@ ++ readlink -f tests/run_c.sh + RUNC=/home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh ++ id -G -+ set -- 1000 0 ++ set -- 1000 20 24 25 29 30 44 46 111 116 120 + ORIGID=1000 -+ NEWID=0 -+ (( 2 < 3 )) -++ id -+ echo 'W: Needs multiple groups for user uid=1000(dancer) gid=1000(dancer) groups=1000(dancer),0(root) for this test to succeed, test skipped' -W: Needs multiple groups for user uid=1000(dancer) gid=1000(dancer) groups=1000(dancer),0(root) for this test to succeed, test skipped -+ exit 0 ++ NEWID=20 ++ (( 11 < 3 )) ++ cd /tmp/XXXX ++ mkdir 1/ ++ touch 1/a 1/b 1/c 1/d ++ dd if=/dev/zero of=1/e bs=512 count=2 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000142476 s, 7.2 MB/s ++ chgrp 1000 1/a 1/b 1/c 1/d ++ ls -li 1/ ++ sleep 1s ++ cp -al 1/ 2 ++ echo ' 2/ before' + 2/ before ++ ls -li 2/ +合計 4 +350071 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 a +350072 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 b +350073 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 c +350074 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 d +350075 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e ++ cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/012_test_chown.c 20 2/a 2/b 2/c +chown 2/a +lchown 2/c ++ echo ' 2/ after' + 2/ after ++ ls -li 2/ +合計 4 +350153 -rw-r--r-- 1 dancer dialout 0 2011-12-04 22:38 a +350072 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 b +350154 -rw-r--r-- 1 dancer dialout 0 2011-12-04 22:38 c +350074 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 d +350075 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e ++ rm -rf 2/ ++ ls -li 1/ ++ echo ' 1/ differences; should not exist' + 1/ differences; should not exist ++ diff -u ls.prev ls.after ++ rm -rf /tmp/XXXX +cow-shell unlink .ilist: No such file or directory diff -Nru cowdancer-0.65ubuntu1/tests/log/013_test_chmod.sh.log cowdancer-0.66/tests/log/013_test_chmod.sh.log --- cowdancer-0.65ubuntu1/tests/log/013_test_chmod.sh.log 2011-09-22 02:27:21.000000000 +0000 +++ cowdancer-0.66/tests/log/013_test_chmod.sh.log 2011-12-04 13:38:08.000000000 +0000 @@ -8,9 +8,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 5.4057e-05 秒、 18.9 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000111187 s, 9.2 MB/s + chmod 600 1/a 1/b 1/c 1/d + ls -li 1/ + sleep 1s @@ -19,21 +19,21 @@ 2/ before + ls -li 2/ 合計 4 -85232 -rw------- 2 dancer dancer 0 9月 22 11:27 a -85233 -rw------- 2 dancer dancer 0 9月 22 11:27 b -85234 -rw------- 2 dancer dancer 0 9月 22 11:27 c -85235 -rw------- 2 dancer dancer 0 9月 22 11:27 d -85236 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +350205 -rw------- 2 dancer dancer 0 2011-12-04 22:38 a +350206 -rw------- 2 dancer dancer 0 2011-12-04 22:38 b +350207 -rw------- 2 dancer dancer 0 2011-12-04 22:38 c +350208 -rw------- 2 dancer dancer 0 2011-12-04 22:38 d +350210 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/013_test_chmod.c 2/a 2/b + echo ' 2/ after' 2/ after + ls -li 2/ 合計 4 -85278 -r-------- 1 dancer dancer 0 9月 22 11:27 a -85233 -rw------- 2 dancer dancer 0 9月 22 11:27 b -85234 -rw------- 2 dancer dancer 0 9月 22 11:27 c -85235 -rw------- 2 dancer dancer 0 9月 22 11:27 d -85236 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e +350286 -r-------- 1 dancer dancer 0 2011-12-04 22:38 a +350206 -rw------- 2 dancer dancer 0 2011-12-04 22:38 b +350207 -rw------- 2 dancer dancer 0 2011-12-04 22:38 c +350208 -rw------- 2 dancer dancer 0 2011-12-04 22:38 d +350210 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/014_ilistdump_test.sh.log cowdancer-0.66/tests/log/014_ilistdump_test.sh.log --- cowdancer-0.65ubuntu1/tests/log/014_ilistdump_test.sh.log 2011-09-22 02:27:22.000000000 +0000 +++ cowdancer-0.66/tests/log/014_ilistdump_test.sh.log 2011-12-04 13:38:08.000000000 +0000 @@ -9,9 +9,9 @@ + ln 1/b 1/bb + cp -al 1 2 + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 7.0889e-05 秒、 14.4 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000144432 s, 7.1 MB/s + cd 1 + sort -k 2 -n + find -links +1 -type f -printf '%D %i\n' diff -Nru cowdancer-0.65ubuntu1/tests/log/015_test_ilistdelete.sh.log cowdancer-0.66/tests/log/015_test_ilistdelete.sh.log --- cowdancer-0.65ubuntu1/tests/log/015_test_ilistdelete.sh.log 2011-09-22 02:27:23.000000000 +0000 +++ cowdancer-0.66/tests/log/015_test_ilistdelete.sh.log 2011-12-04 13:38:11.000000000 +0000 @@ -9,9 +9,9 @@ + touch 1/a 1/b 1/c 1/d + cp -al 1 2 + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 7.4311e-05 秒、 13.8 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.00929168 s, 110 kB/s + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/015_test_ilistdelete.c open: No such file or directory open: No such file or directory diff -Nru cowdancer-0.65ubuntu1/tests/log/016_memleakcheck.sh.log cowdancer-0.66/tests/log/016_memleakcheck.sh.log --- cowdancer-0.65ubuntu1/tests/log/016_memleakcheck.sh.log 2011-09-22 02:27:25.000000000 +0000 +++ cowdancer-0.66/tests/log/016_memleakcheck.sh.log 2011-12-04 13:38:13.000000000 +0000 @@ -8,34 +8,33 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 7.5708e-05 秒、 13.5 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000130464 s, 7.8 MB/s + cp -al 1 2 + MALLOC_TRACE=log + cow-shell /tmp/XXXX/tracer -08048000-08049000 r-xp 00000000 00:12 85501 /tmp/XXXX/tracer -08049000-0804a000 rw-p 00000000 00:12 85501 /tmp/XXXX/tracer -08951000-08972000 rw-p 00000000 00:00 0 [heap] -40000000-4001b000 r-xp 00000000 08:05 98482 /lib/i386-linux-gnu/ld-2.13.so -4001b000-4001c000 r--p 0001b000 08:05 98482 /lib/i386-linux-gnu/ld-2.13.so -4001c000-4001d000 rw-p 0001c000 08:05 98482 /lib/i386-linux-gnu/ld-2.13.so +08048000-08049000 r-xp 00000000 00:11 350456 /tmp/XXXX/tracer +08049000-0804a000 rw-p 00000000 00:11 350456 /tmp/XXXX/tracer +09bbd000-09bde000 rw-p 00000000 00:00 0 [heap] +40000000-4001b000 r-xp 00000000 08:05 286252 /lib/ld-2.11.2.so +4001b000-4001c000 r--p 0001a000 08:05 286252 /lib/ld-2.11.2.so +4001c000-4001d000 rw-p 0001b000 08:05 286252 /lib/ld-2.11.2.so 4001d000-4001e000 r-xp 00000000 00:00 0 [vdso] 4001e000-40020000 rw-p 00000000 00:00 0 -40020000-40024000 r-xp 00000000 fe:00 663749 /home/dancer/DEBIAN/cowdancer/cowdancer/libcowdancer.so -40024000-40025000 rw-p 00003000 fe:00 663749 /home/dancer/DEBIAN/cowdancer/cowdancer/libcowdancer.so -40025000-40026000 r--p 00000000 00:12 85511 /tmp/XXXX/.ilist -40026000-40029000 rw-p 00000000 00:00 0 -4002d000-4016b000 r-xp 00000000 08:05 98480 /lib/i386-linux-gnu/libc-2.13.so -4016b000-4016c000 ---p 0013e000 08:05 98480 /lib/i386-linux-gnu/libc-2.13.so -4016c000-4016e000 r--p 0013e000 08:05 98480 /lib/i386-linux-gnu/libc-2.13.so -4016e000-4016f000 rw-p 00140000 08:05 98480 /lib/i386-linux-gnu/libc-2.13.so -4016f000-40173000 rw-p 00000000 00:00 0 -40173000-40175000 r-xp 00000000 08:05 98468 /lib/i386-linux-gnu/libdl-2.13.so -40175000-40176000 r--p 00001000 08:05 98468 /lib/i386-linux-gnu/libdl-2.13.so -40176000-40177000 rw-p 00002000 08:05 98468 /lib/i386-linux-gnu/libdl-2.13.so -40177000-40178000 rw-p 00000000 00:00 0 -bfd03000-bfd18000 rw-p 00000000 00:00 0 [stack] +40020000-40023000 r-xp 00000000 fe:00 3522588 /home/dancer/DEBIAN/cowdancer/cowdancer/libcowdancer.so +40023000-40024000 rw-p 00003000 fe:00 3522588 /home/dancer/DEBIAN/cowdancer/cowdancer/libcowdancer.so +40024000-40025000 r--p 00000000 00:11 350474 /tmp/XXXX/.ilist +40025000-40028000 rw-p 00000000 00:00 0 +4003d000-4017d000 r-xp 00000000 08:05 1197055 /lib/i686/cmov/libc-2.11.2.so +4017d000-4017f000 r--p 0013f000 08:05 1197055 /lib/i686/cmov/libc-2.11.2.so +4017f000-40180000 rw-p 00141000 08:05 1197055 /lib/i686/cmov/libc-2.11.2.so +40180000-40184000 rw-p 00000000 00:00 0 +40184000-40186000 r-xp 00000000 08:05 1197047 /lib/i686/cmov/libdl-2.11.2.so +40186000-40187000 r--p 00001000 08:05 1197047 /lib/i686/cmov/libdl-2.11.2.so +40187000-40188000 rw-p 00002000 08:05 1197047 /lib/i686/cmov/libdl-2.11.2.so +40188000-40189000 rw-p 00000000 00:00 0 +bfac1000-bfad6000 rw-p 00000000 00:00 0 [stack] + RESULT=0 + mtrace /tmp/XXXX/tracer /tmp/XXXX/log No memory leaks. diff -Nru cowdancer-0.65ubuntu1/tests/log/017_tempfilecheck.sh.log cowdancer-0.66/tests/log/017_tempfilecheck.sh.log --- cowdancer-0.65ubuntu1/tests/log/017_tempfilecheck.sh.log 2011-09-22 02:27:26.000000000 +0000 +++ cowdancer-0.66/tests/log/017_tempfilecheck.sh.log 2011-12-04 13:38:14.000000000 +0000 @@ -5,9 +5,9 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d 1/a~~ + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 6.9771e-05 秒、 14.7 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000144362 s, 7.1 MB/s + cp -al 1 2 + cow-shell touch 1/a + ls 1/a~~ diff -Nru cowdancer-0.65ubuntu1/tests/log/018_testcxx.sh.log cowdancer-0.66/tests/log/018_testcxx.sh.log --- cowdancer-0.65ubuntu1/tests/log/018_testcxx.sh.log 2011-09-22 02:27:29.000000000 +0000 +++ cowdancer-0.66/tests/log/018_testcxx.sh.log 2011-12-04 13:38:23.000000000 +0000 @@ -9,17 +9,17 @@ + mkdir 1/ + touch 1/a 1/b 1/c 1/d + dd if=/dev/zero of=1/e bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 6.5092e-05 秒、 15.7 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000110139 s, 9.3 MB/s + cp -al 1 0 + cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_cxx.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/018_testcxx.cc + cat 1/a Hello world + cat 0/a + diff -u 1/a 0/a ---- 1/a 2011-09-22 11:27:28.676821911 +0900 -+++ 0/a 2011-09-22 11:27:26.448822198 +0900 +--- 1/a 2011-12-04 22:38:22.474162297 +0900 ++++ 0/a 2011-12-04 22:38:15.078158955 +0900 @@ -1 +0,0 @@ -Hello world + RESULT=0 diff -Nru cowdancer-0.65ubuntu1/tests/log/019_test_filename_with_space.sh.log cowdancer-0.66/tests/log/019_test_filename_with_space.sh.log --- cowdancer-0.65ubuntu1/tests/log/019_test_filename_with_space.sh.log 2011-09-22 02:27:31.000000000 +0000 +++ cowdancer-0.66/tests/log/019_test_filename_with_space.sh.log 2011-12-04 13:38:25.000000000 +0000 @@ -4,9 +4,9 @@ + mkdir 1/ + touch '1/a'\''f' '1/b g' '1/c h' '1/d i' + dd if=/dev/zero 'of=1/e j' bs=512 count=2 -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 7.5708e-05 秒、 13.5 MB/秒 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.00012327 s, 8.3 MB/s + ls -li 1/ + sleep 1s + cp -al 1/ 2 @@ -14,25 +14,25 @@ 2/ before + ls -li 2/ 合計 4 -85989 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 a'f -85990 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 b g -85991 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 c h -85992 -rw-r--r-- 2 dancer dancer 0 9月 22 11:27 d i -85995 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e j -+ echo 'cd 2 && echo a > "a'\''f" && mv '\''b g'\'' '\''c h'\'' && touch '\''c h'\'' && dd if='\''e j'\'' of='\''d i'\''' +350767 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 a'f +350768 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 b g +350769 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 c h +350770 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 d i +350771 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e j + cow-shell -Invoking /bin/sh -2+0 レコード入力 -2+0 レコード出力 -1024 バイト (1.0 kB) コピーされました、 9.261e-05 秒、 11.1 MB/秒 ++ echo 'cd 2 && echo a > "a'\''f" && mv '\''b g'\'' '\''c h'\'' && touch '\''c h'\'' && dd if='\''e j'\'' of='\''d i'\''' +Invoking /bin/bash +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000165524 s, 6.2 MB/s + echo ' 2/ after' 2/ after + ls -li 2/ 合計 12 -86138 -rw-r--r-- 1 dancer dancer 2 9月 22 11:27 a'f -86142 -rw-r--r-- 1 dancer dancer 0 9月 22 11:27 c h -86144 -rw-r--r-- 1 dancer dancer 1024 9月 22 11:27 d i -85995 -rw-r--r-- 2 dancer dancer 1024 9月 22 11:27 e j +350814 -rw-r--r-- 1 dancer dancer 2 2011-12-04 22:38 a'f +350817 -rw-r--r-- 1 dancer dancer 0 2011-12-04 22:38 c h +350818 -rw-r--r-- 1 dancer dancer 1024 2011-12-04 22:38 d i +350771 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e j + rm -rf 2/ + ls -li 1/ + echo ' 1/ differences; should not exist' diff -Nru cowdancer-0.65ubuntu1/tests/log/020_test_lchown.sh.log cowdancer-0.66/tests/log/020_test_lchown.sh.log --- cowdancer-0.65ubuntu1/tests/log/020_test_lchown.sh.log 2011-09-22 02:27:31.000000000 +0000 +++ cowdancer-0.66/tests/log/020_test_lchown.sh.log 2011-12-04 13:38:29.000000000 +0000 @@ -5,11 +5,51 @@ ++ readlink -f tests/run_c.sh + RUNC=/home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh ++ id -G -+ set -- 1000 0 ++ set -- 1000 20 24 25 29 30 44 46 111 116 120 + ORIGID=1000 -+ NEWID=0 -+ (( 2 < 3 )) -++ id -+ echo 'W: Needs multiple groups for user uid=1000(dancer) gid=1000(dancer) groups=1000(dancer),0(root) for this test to succeed, test skipped' -W: Needs multiple groups for user uid=1000(dancer) gid=1000(dancer) groups=1000(dancer),0(root) for this test to succeed, test skipped -+ exit 0 ++ NEWID=20 ++ (( 11 < 3 )) ++ cd /tmp/XXXX ++ mkdir 1/ ++ touch 1/a 1/b 1/c 1/d ++ ln -s a 1/f ++ ln -s b 1/g ++ dd if=/dev/zero of=1/e bs=512 count=2 +2+0 records in +2+0 records out +1024 bytes (1.0 kB) copied, 0.000138565 s, 7.4 MB/s ++ chgrp 1000 1/a 1/b 1/c 1/d ++ ls -li 1/ ++ sleep 1s ++ cp -al 1/ 2 ++ echo ' 2/ before' + 2/ before ++ ls -li 2/ +合計 4 +350870 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 a +350871 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 b +350872 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 c +350873 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 d +350876 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e +350911 lrwxrwxrwx 1 dancer dancer 1 2011-12-04 22:38 f -> a +350910 lrwxrwxrwx 1 dancer dancer 1 2011-12-04 22:38 g -> b ++ cow-shell /home/dancer/DEBIAN/cowdancer/cowdancer/tests/run_c.sh /home/dancer/DEBIAN/cowdancer/cowdancer/tests/012_test_chown.c 20 2/f 2/b 2/g +chown 2/f +lchown 2/g ++ echo ' 2/ after' + 2/ after ++ ls -li 2/ +合計 4 +350981 -rw-r--r-- 1 dancer dialout 0 2011-12-04 22:38 a +350871 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 b +350872 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 c +350873 -rw-r--r-- 2 dancer dancer 0 2011-12-04 22:38 d +350876 -rw-r--r-- 2 dancer dancer 1024 2011-12-04 22:38 e +350911 lrwxrwxrwx 1 dancer dancer 1 2011-12-04 22:38 f -> a +350910 lrwxrwxrwx 1 dancer dialout 1 2011-12-04 22:38 g -> b ++ rm -rf 2/ ++ ls -li 1/ ++ echo ' 1/ differences; should not exist' + 1/ differences; should not exist ++ diff -u ls.prev ls.after ++ rm -rf /tmp/XXXX diff -Nru cowdancer-0.65ubuntu1/tests/log/test_file.c.log cowdancer-0.66/tests/log/test_file.c.log --- cowdancer-0.65ubuntu1/tests/log/test_file.c.log 2011-09-22 02:27:11.000000000 +0000 +++ cowdancer-0.66/tests/log/test_file.c.log 2011-12-04 13:37:21.000000000 +0000 @@ -1,5 +1,5 @@ /root//dev: Permission denied - forking: diff -u /proc/mounts /tmp/testfileKAatFf + forking: diff -u /proc/mounts /tmp/testfileuPEfpp file copy: open for write: No such file or directory creat: No such file or directory E: Could not create /tmp/nonexisting/file/path/here diff -Nru cowdancer-0.65ubuntu1/tests/log/test_qemuarch.c.log cowdancer-0.66/tests/log/test_qemuarch.c.log --- cowdancer-0.65ubuntu1/tests/log/test_qemuarch.c.log 2011-09-22 02:27:14.000000000 +0000 +++ cowdancer-0.66/tests/log/test_qemuarch.c.log 2011-12-04 13:37:34.000000000 +0000 @@ -1,8 +1,8 @@ -/tmp/dancerTGYy6S/dev/console: Operation not permitted -/tmp/dancerTGYy6S/dev/ttyS0: Operation not permitted -/tmp/dancerTGYy6S/dev/ttyAMA0: Operation not permitted -/tmp/dancerTGYy6S/dev/sda: Operation not permitted -/tmp/dancerTGYy6S/dev/sdb: Operation not permitted -/tmp/dancerTGYy6S/dev/hda: Operation not permitted -/tmp/dancerTGYy6S/dev/hdb: Operation not permitted -/tmp/dancerTGYy6S +/tmp/dancer3OH97F/dev/console: Operation not permitted +/tmp/dancer3OH97F/dev/ttyS0: Operation not permitted +/tmp/dancer3OH97F/dev/ttyAMA0: Operation not permitted +/tmp/dancer3OH97F/dev/sda: Operation not permitted +/tmp/dancer3OH97F/dev/sdb: Operation not permitted +/tmp/dancer3OH97F/dev/hda: Operation not permitted +/tmp/dancer3OH97F/dev/hdb: Operation not permitted +/tmp/dancer3OH97F