[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r536 - in GNUnet: . src/applications/fs/ecrs
From: |
grothoff |
Subject: |
[GNUnet-SVN] r536 - in GNUnet: . src/applications/fs/ecrs |
Date: |
Thu, 31 Mar 2005 11:52:02 -0800 (PST) |
Author: grothoff
Date: 2005-03-31 11:51:58 -0800 (Thu, 31 Mar 2005)
New Revision: 536
Modified:
GNUnet/src/applications/fs/ecrs/directory.c
GNUnet/src/applications/fs/ecrs/directorytest.c
GNUnet/src/applications/fs/ecrs/upload.c
GNUnet/todo
Log:
fixing directorytest
Modified: GNUnet/src/applications/fs/ecrs/directory.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directory.c 2005-03-31 19:16:43 UTC (rev
535)
+++ GNUnet/src/applications/fs/ecrs/directory.c 2005-03-31 19:51:58 UTC (rev
536)
@@ -72,7 +72,7 @@
BREAK();
return SYSERR; /* malformed !*/
}
- pos = 8 + sizeof(unsigned int);
+ pos = 8 + sizeof(unsigned int) + mdSize;
}
while (pos < len) {
/* find end of URI */
@@ -81,8 +81,10 @@
skip to next alignment */
align = ((pos / BLOCK_ALIGN_SIZE)+1) * BLOCK_ALIGN_SIZE;
pos = align;
- if (pos >= len)
+ if (pos >= len) {
+ BREAK();
break;
+ }
}
epos = pos;
while ( (epos < len) &&
Modified: GNUnet/src/applications/fs/ecrs/directorytest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/directorytest.c 2005-03-31 19:16:43 UTC
(rev 535)
+++ GNUnet/src/applications/fs/ecrs/directorytest.c 2005-03-31 19:51:58 UTC
(rev 536)
@@ -105,8 +105,10 @@
dlen,
&meta2,
&processor,
- &cls))
+ &cls)) {
+ printf("expected %u\n", i);
ABORT();
+ }
if (! ECRS_equalsMetaData(meta,
meta2))
ABORT();
@@ -124,8 +126,11 @@
int failureCount = 0;
int i;
- for (i=17;i<18;i++)
+ for (i=17;i<10000;i*=2) {
+ fprintf(stderr, ".");
failureCount += testDirectory(i);
+ }
+ fprintf(stderr, "\n");
if (failureCount == 0)
return 0;
Modified: GNUnet/src/applications/fs/ecrs/upload.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/upload.c 2005-03-31 19:16:43 UTC (rev
535)
+++ GNUnet/src/applications/fs/ecrs/upload.c 2005-03-31 19:51:58 UTC (rev
536)
@@ -56,7 +56,6 @@
EncName enc;
size = ntohl(iblocks[level]->size);
- GNUNET_ASSERT(size < MAX_BUFFER_SIZE);
GNUNET_ASSERT(size > sizeof(Datastore_Value));
size -= sizeof(Datastore_Value);
GNUNET_ASSERT(size - sizeof(DBlock) <= IBLOCK_SIZE);
Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-03-31 19:16:43 UTC (rev 535)
+++ GNUnet/todo 2005-03-31 19:51:58 UTC (rev 536)
@@ -1,5 +1,4 @@
0.7.0pre1 [4'05] (aka "preview"):
-* directorytest (ECRS) also fails
* package & re-run final tests
0.7.0 [6'05?] (aka "compatibility? what's that?"):
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r536 - in GNUnet: . src/applications/fs/ecrs,
grothoff <=