Ph. Marek wrote on 17/11/2006 14:07:
> Does this work for you?
here the result:
$ gmake
cc -idirafter /usr/local/include -idirafter /usr/include -idirafter
/openpkg/include -idirafter /usr/local/include/apr-1 -MM -MF .fsvs.d fsvs.c
ctags ac_list.c actions.c add_unvers.c build.c checksum.c commit.c
direnum.c est_ops.c export.c fsvs.c helper.c ignore.c info.c init.c
pwcache.c racallback.c remote.c status.c sync.c update.c waa.c
warnings.c actions.h add_unvers.h build.h checksum.h commit.h config.h
direnum.h est_ops.h export.h global.h helper.h ignore.h info.h init.h
interface.h pwcache.h racallback.h remote.h status.h sync.h update.h
waa.h warnings.h
Duplicate entry in file direnum.c, line 118: dir__start_enum
Second entry ignored
Duplicate entry in file direnum.c, line 131: dir__enum
Second entry ignored
Duplicate entry in file direnum.c, line 148: dir__close
Second entry ignored
Duplicate entry in file direnum.c, line 160: dir__get_dir_size
Second entry ignored
Duplicate entry in file global.h, line 286: DEBUGP
Second entry ignored
cc -Wall -funsigned-char -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64
-idirafter /usr/local/include -idirafter /usr/include -idirafter
/openpkg/include -idirafter /usr/local/include/apr-1 -Os
-DFSVS_VERSION='"trunk:479"' -c -o fsvs.o fsvs.c
fsvs.c: In function `_DEBUGP':
fsvs.c:101: warning: passing arg 1 of `localtime' from incompatible
pointer type
fsvs.c: In function `_STOP':
fsvs.c:152: warning: passing arg 1 of `localtime' from incompatible
pointer type
cc -L/usr/local/lib -L/openpkg/lib -lsvn_subr-1 -lsvn_ra-1
-lsvn_client-1 -lpcre fsvs.o ac_list.o actions.o add_unvers.o build.o
checksum.o commit.o direnum.o est_ops.o export.o helper.o ignore.o
info.o init.o pwcache.o racallback.o remote.o status.o sync.o update.o
waa.o warnings.o -o fsvs
commit.o(.text+0xd5f): In function `ci__getmsg':
: warning: strcpy() is almost always misused, please use strlcpy()
/usr/local/lib/libsvn_subr-1.so.0.0: warning: sprintf() is often
misused, please use snprintf()
commit.o(.text+0xd6a): In function `ci__getmsg':
: warning: strcat() is almost always misused, please use strlcat()
-rwx------ 1 touche wheel 153222 Nov 17 15:50 fsvs
$ ./fsvs status|head -10
N... 153 ./.ac_list.d
N... 92 ./.actions.d
N... 108 ./.add_unvers.d
N... 59 ./.build.d
N... 84 ./.checksum.d
N... 130 ./.commit.d
N... 74 ./.direnum.d
N... 111 ./.est_ops.d
N... 91 ./.export.d
N... 109 ./.fsvs.d
$ ./fsvs st -d |head -10
15:52:49.134 main[fsvs.c:375] no argument at optind=3 of 3
15:52:49.166 main[fsvs.c:480] LC_ALL gives C
15:52:49.166 main[fsvs.c:487] LC_CTYPE gives C
15:52:49.166 main[fsvs.c:498] codeset found to be 646
15:52:49.166 main[fsvs.c:507] codeset: using identity
15:52:49.166 main[fsvs.c:528] optind=2 per_sts=100 action=status
15:52:49.166 main[fsvs.c:531] argument 1: st
15:52:49.167 ign__new_pattern[ignore.c:725] getting 1 new entries - max
is 0, used are 0
15:52:49.167 ign__new_pattern[ignore.c:784] new pattern INODE:0:0:221
15:52:49.167 ign___init_pattern_into[ignore.c:256] pattern: case, ignore
$ gmake run-tests 2>&1 | tee test.log01a
gmake -C test BINARY=/share2/tmp/_testing/fsvs/src/fsvs
gmake[1]: Entering directory `/share2/tmp/_testing/fsvs/src/test'
Preparing default repository.
/share2/tmp/_testing/fsvs/src/test/001_init_dir: line 23: seq: command
not found
"":23: NOK: shell error
gmake[1]: *** [/tmp/fsvs-test-1000/default-repository] Error 1
gmake[1]: Leaving directory `/share2/tmp/_testing/fsvs/src/test'
gmake: *** [run-tests] Error 2
no locale problem but
=> seq is linux/GNU only ...
prefer something like
j=0; while [ $j -lt 10 ]; do ...; j=`expr $j + 1`; done
there is another way for openbsd with jot
http://www.openbsd.org/cgi-bin/man.cgi?query=jot&apropos=0&sektion=0&manpath=OpenBSD+Current&arch=i386&format=html
using jot for the test, with (001, 009, 11, 13, 19)
23c23
< jot 99999 1 > $filename
---
> seq 1 99999 > $filename
also
(011 & 015) md5sum -> md5
it seems to work (see joined file)
congratulations :)
Regards
Julien
gmake -C test BINARY=/share2/tmp/_testing/fsvs/src/fsvs
gmake[1]: Entering directory `/share2/tmp/_testing/fsvs/src/test'
Running tests...
[34m_______________________________________________________
"001_init_dir":1: (Fri Nov 17 16:26:57 CET 2006)[37;40m
committed revision 4 on 2006-11-17T15:27:06.136050Z as touche
[34m_______________________________________________________
"002_co_other":1: (Fri Nov 17 16:27:06 CET 2006)[37;40m
** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m002_co_other at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"003_change_type":1: (Fri Nov 17 16:27:08 CET 2006)[37;40m
ci
committed revision 4 on 2006-11-17T15:27:12.252472Z as touche
up
Updated to revision 4.
st
----- comparison of directory gave no differences
ci
committed revision 5 on 2006-11-17T15:27:16.231037Z as touche
** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m003_change_type at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"004_delete":1: (Fri Nov 17 16:27:18 CET 2006)[37;40m
ci
committed revision 5 on 2006-11-17T15:27:28.935449Z as touche
st1
** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m004_delete at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"005_change_type":1: (Fri Nov 17 16:27:30 CET 2006)[37;40m
[33m"005_change_type":24: WARNING: cannot test device creation as normal user.
[37;40m
[34m_______________________________________________________
"006_move_entries":1: (Fri Nov 17 16:27:40 CET 2006)[37;40m
ci
committed revision 5 on 2006-11-17T15:27:49.176006Z as touche
st1
** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m006_move_entries at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"007_update_changed":1: (Fri Nov 17 16:27:50 CET 2006)[37;40m
ci1
committed revision 4 on 2006-11-17T15:27:52.491659Z as touche
** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m007_update_changed at 23: 2nd working copy correctly updated.
[37;40m ci2
committed revision 5 on 2006-11-17T15:27:53.142217Z as touche
up1
[32m007_update_changed at 31: Modified files are not overwritten.
[37;40m ** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m007_update_changed at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"008_update_to_rev":1: (Fri Nov 17 16:27:54 CET 2006)[37;40m
now at rev. 3
ci1
committed revision 4 on 2006-11-17T15:27:56.446791Z as touche
ci2
committed revision 5 on 2006-11-17T15:27:56.687064Z as touche
Updated to revision 3.
[32m008_update_to_rev at 59: Ok, file was deleted
[37;40m[32m008_update_to_rev at 64: remote-status says to-be-done (1).
[37;40mUpdated to revision 4.
[32m008_update_to_rev at 76: Ok, file was added
[37;40m[32m008_update_to_rev at 81: remote-status says to-be-done (2).
[37;40mUpdated to revision 5.
[32m008_update_to_rev at 92: file was modified
[37;40m[32m008_update_to_rev at 97: remote-status to old revision says
to-be-deleted.
[37;40m[32m008_update_to_rev at 105: remote-status says nothing.
[37;40m[32m008_update_to_rev at 114: remote-status on touched file says
nothing.
[37;40m
[34m_______________________________________________________
"009_bigger_files":1: (Fri Nov 17 16:27:58 CET 2006)[37;40m
ci1
committed revision 4 on 2006-11-17T15:28:09.861423Z as touche
/var/spool/fsvs/03/cc/da6721b8d85cc3ac553f09bd9510//md5s
ci2
committed revision 5 on 2006-11-17T15:28:18.204008Z as touche
Ok, Committing a big file creates the md5s-data
** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m009_bigger_files at 23: 2nd working copy correctly updated.
[37;40mOk, update and commit give the same manber-hashes and MD5s
committed revision 6 on 2006-11-17T15:28:30.651021Z as touche
** up
Updated to revision 6.
** st
** compare
----- comparison of directory gave no differences
[32m009_bigger_files at 23: 2nd working copy correctly updated.
[37;40mOk, Committing a deleted file removes the md5s-data
Ok, Updating a deleted file removes the md5s-data
[34m_______________________________________________________
"010_non-existant_uids":1: (Fri Nov 17 16:28:31 CET 2006)[37;40m
Warning: cannot test changing userids as normal user.
[34m_______________________________________________________
"011_ignore":1: (Fri Nov 17 16:28:32 CET 2006)[37;40m
committed revision 4 on 2006-11-17T15:28:35.304986Z as touche
** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m011_ignore at 23: 2nd working copy correctly updated.
[37;40m24 new files, 12 to take.
[32m011_ignore at 90: ignore dump seems to work
[37;40m[32m011_ignore at 103: 'ignore dump | ignore load' gives identity
[37;40m12 after filtering.
Testing for files which should not be found ...
Testing for files which should be found ...
committed 12 files, expect 12
up-x
Updated to revision 5.
[32m011_ignore at 155: update gets no ignored files
[37;40mRestoring working copies to an equal state.
committed revision 6 on 2006-11-17T15:28:42.184674Z as touche
Updated to revision 6.
Testing pattern list edits.
[32m011_ignore at 176: empty state.
[37;40m[32m011_ignore at 191: pattern edit operations work.
[37;40m ** up
Updated to revision 6.
** st
** compare
----- comparison of directory gave no differences
[32m011_ignore at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"012_export":1: (Fri Nov 17 16:28:44 CET 2006)[37;40m
Exported revision 4.
----- comparison of directory gave no differences
Exported revision 3.
Updated to revision 3.
----- comparison of directory gave no differences
[34m_______________________________________________________
"013_manber":1: (Fri Nov 17 16:28:55 CET 2006)[37;40m
=== Testing with a big file ===
ci1
committed revision 4 on 2006-11-17T15:29:10.992886Z as touche
[32m013_manber at 164: Ok, not seen as changed (1) ('.....', with '-v')
[37;40m[32m013_manber at 164: Ok, not seen as changed (2) ('.....',
with '-v -C')
[37;40m[32m013_manber at 164: Ok, not seen as changed (3) ('.....',
with '-v -C -C')
[37;40m touch, but don't change
[32m013_manber at 164: Ok, possibly changed (4) ('.m.?', with '')
[37;40m[32m013_manber at 164: Ok, not changed (5) ('.m..', with '-C')
[37;40m[32m013_manber at 164: Ok, not changed (6) ('.m..', with '-C
-C')
[37;40m change, but with original timestamp
[32m013_manber at 164: Ok, not seen as changed (7) ('.....', with '-v')
[37;40m[32m013_manber at 164: Ok, change not seen (8) ('.....', with
'-C -v')
[37;40m[32m013_manber at 164: Ok, change found (9) ('...C.', with '-C
-C -v')
[37;40m ci2
committed revision 5 on 2006-11-17T15:29:14.246518Z as touche
=== Testing with an empty directory ===
committed revision 6 on 2006-11-17T15:29:14.524351Z as touche
ci1
committed revision 7 on 2006-11-17T15:29:14.720097Z as touche
[32m013_manber at 177: Ok, not seen as changed (1) ('.....', with '-v')
[37;40m[32m013_manber at 177: Ok, not seen as changed (2) ('.....',
with '-v -C')
[37;40m[32m013_manber at 177: Ok, not seen as changed (3) ('.....',
with '-v -C -C')
[37;40m touch, but don't change
[32m013_manber at 177: Ok, possibly changed (4) ('.m..', with '')
[37;40m[32m013_manber at 177: Ok, not changed (5) ('.m..', with '-C')
[37;40m[32m013_manber at 177: Ok, not changed (6) ('.m..', with '-C
-C')
[37;40m change, but with original timestamp
[32m013_manber at 177: Ok, not seen as changed (7) ('.....', with '-v')
[37;40m[32m013_manber at 177: Ok, change not seen (8) ('.....', with
'-C -v')
[37;40m ci2
committed revision 8 on 2006-11-17T15:29:17.337001Z as touche
=== Testing with an non-empty directory ===
committed revision 9 on 2006-11-17T15:29:17.753222Z as touche
ci1
committed revision 10 on 2006-11-17T15:29:17.941881Z as touche
[32m013_manber at 192: Ok, not seen as changed (1) ('.....', with '-v')
[37;40m[32m013_manber at 192: Ok, not seen as changed (2) ('.....',
with '-v -C')
[37;40m[32m013_manber at 192: Ok, not seen as changed (3) ('.....',
with '-v -C -C')
[37;40m touch, but don't change
[32m013_manber at 192: Ok, possibly changed (4) ('.m..', with '')
[37;40m[32m013_manber at 192: Ok, not changed (5) ('.m..', with '-C')
[37;40m[32m013_manber at 192: Ok, not changed (6) ('.m..', with '-C
-C')
[37;40m change, but with original timestamp
[32m013_manber at 192: Ok, change found (9) ('...C.', with '-C -C -v')
[37;40m ci2
committed revision 11 on 2006-11-17T15:29:20.422823Z as touche
** up
Updated to revision 11.
** st
** compare
----- comparison of directory gave no differences
[32m013_manber at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"014_basic_tests":1: (Fri Nov 17 16:29:21 CET 2006)[37;40m
ci
[32m014_basic_tests at 41: new-file1 is new
[37;40m[32m014_basic_tests at 50: found revision line
[37;40m ** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m014_basic_tests at 23: 2nd working copy correctly updated.
[37;40m ci
[32m014_basic_tests at 41: new-file2 is new
[37;40m[32m014_basic_tests at 50: found revision line
[37;40m ** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m014_basic_tests at 23: 2nd working copy correctly updated.
[37;40mdelete a file
ci
[32m014_basic_tests at 76: new-file2 is deleted
[37;40m[32m014_basic_tests at 85: found revision line
[37;40m ** up
Updated to revision 6.
** st
** compare
----- comparison of directory gave no differences
[32m014_basic_tests at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"015_sync_repos":1: (Fri Nov 17 16:29:29 CET 2006)[37;40m
Directory file is /var/spool/fsvs/a8/8b/fdb46ed62a8c7fe4d6a94234e010//dir
Updated to revision 4.
Synchronized to revision 4.
found MD5s: update=6f0925364f4fed48a8873ac110f92fad
sync=6f0925364f4fed48a8873ac110f92fad
from wc=68e8941d4256175aca3cdaba27817e68
[32m015_sync_repos at 47: sync-repos ident
[37;40m[32m015_sync_repos at 61: no status output
[37;40mUpdated to revision 4.
Updated to revision 3.
Synchronized to revision 3.
Updated to revision 4.
[34m_______________________________________________________
"016_add_unversion":1: (Fri Nov 17 16:29:41 CET 2006)[37;40m
[32m016_add_unversion at 27: all ignored
[37;40m[32m016_add_unversion at 58: 2 added
[37;40m[32m016_add_unversion at 67: 2 committed
[37;40m[32m016_add_unversion at 76: files are in repository.
[37;40m[32m016_add_unversion at 86: unversioned
[37;40m[32m016_add_unversion at 94: unversioned committed
[37;40m[32m016_add_unversion at 102: file still exists
[37;40m[32m016_add_unversion at 113: file was removed from repository.
[37;40m[32m016_add_unversion at 126: commit stopped on missing entry.
[37;40m[32m016_add_unversion at 131: status shows missing entry
[37;40m[32m016_add_unversion at 151: entry not here.
[37;40m
[34m_______________________________________________________
"017_locale_iconv":1: (Fri Nov 17 16:29:48 CET 2006)[37;40m
/share2/tmp/_testing/fsvs/src/test/017_locale_iconv: line 54: locale: command
not found
Found no utf8-locale, cannot test
/share2/tmp/_testing/fsvs/src/test/017_locale_iconv: line 64: locale: command
not found
Found no non-utf8-locale, cannot test
committed revision 4 on 2006-11-17T15:29:50.232533Z as touche
** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m017_locale_iconv at 23: 2nd working copy correctly updated.
[37;40mOk, found all 3 entries.
committed revision 5 on 2006-11-17T15:29:51.208993Z as touche
** up
Updated to revision 5.
** st
** compare
----- comparison of directory gave no differences
[32m017_locale_iconv at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"018_various":1: (Fri Nov 17 16:29:51 CET 2006)[37;40m
committed revision 4 on 2006-11-17T15:29:53.724645Z as touche
[32m018_various at 17: message was taken
[37;40mcommitted revision 5 on 2006-11-17T15:29:54.174789Z as touche
[32m018_various at 29: message was taken
[37;40m[32m018_various at 38: unknown warnings are rejected
[37;40m[32m018_various at 45: unknown warning actions are rejected
[37;40m[32m018_various at 67: test-warning can stop fsvs
[37;40m[32m018_various at 78: test-warning can be set to non-fatal
[37;40m[32m018_various at 89: slashes at end of URL are ignored.
[37;40m[32m018_various at 99: version and help are given
[37;40m[32m018_various at 122: actions are checked
[37;40m[32m018_various at 131: error for non-existing directories
[37;40m[32m018_various at 141: help needs no $WAA
[37;40m
[34m_______________________________________________________
"019_many_files":1: (Fri Nov 17 16:29:56 CET 2006)[37;40m
Generating 8421 entries: ....................!
Looking for them.
[32m019_many_files at 46: fsvs found all 8421 changed entries.
[37;40mCheckin ...
committed revision 4 on 2006-11-17T15:52:03.862628Z as touche
Checkout ...
** up
Updated to revision 4.
** st
** compare
----- comparison of directory gave no differences
[32m019_many_files at 23: 2nd working copy correctly updated.
[37;40m
[34m_______________________________________________________
"020_partial_ci":1: (Fri Nov 17 16:54:43 CET 2006)[37;40m
committed revision 4 on 2006-11-17T15:56:43.586617Z as touche
[32m020_partial_ci at 50: Ok, commit of a file beneath another new file works
[37;40m[32m020_partial_ci at 60: commit of a file beneath a committed file
works
[37;40m[32m020_partial_ci at 76: commit of a changed file beneath another
changed file works
[37;40m[32m020_partial_ci at 106: commit of a single directory works
[37;40m[32m020_partial_ci at 121: initial commit works
[37;40m
[34m_______________________________________________________
"022_update_details":1: (Fri Nov 17 16:56:46 CET 2006)[37;40m
[33m"022_update_details":15: WARNING: This test is currently deactivated.
[37;40m[33m"022_update_details":16: WARNING: The bug is known and being
worked on.
[37;40m
[34m_______________________________________________________
"030_eperm_warn":1: (Fri Nov 17 16:56:55 CET 2006)[37;40m
committed revision 4 on 2006-11-17T15:56:58.211875Z as touche
A tmp/file
Checked out revision 4.
property 'svn:owner' set on 'tmp/file'
property 'svn:group' set on 'tmp/file'
Sending tmp/file
Committed revision 5.
Testing warning
[32m030_eperm_warn at 45: warning given
[37;40mTesting stopping
[32m030_eperm_warn at 62: stopped.
[37;40m
[34m_______________________________________________________
"031_info":1: (Fri Nov 17 16:57:03 CET 2006)[37;40m
Checkin ...
committed revision 4 on 2006-11-17T15:57:05.078072Z as touche
getting status.
[32m031_info at 40: found Type: file
[37;40m[32m031_info at 41: found Status: 0x0
[37;40m[32m031_info at 42: found Flags: 0x100000
[37;40m[32m031_info at 43: found Mode: 0100742
[37;40m[32m031_info at 44: found UID/GID: 1000/.*
[37;40m[32m031_info at 45: found MTime: Mon
[37;40m[32m031_info at 46: found Revision: 4
[37;40m[32m031_info at 47: found Size: 0
[37;40m
[32m031_info at 50: info prints the expected data
[37;40mgmake[1]: Leaving directory `/share2/tmp/_testing/fsvs/src/test'
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]