Changeset 30252

Timestamp:

Jan 12, 2011, 4:15:13 PM (15 years ago)

Author:

watersc1

Message:

tell which roc file is invalid when an error is found.

File:

• branches/eam_branches/ipp-20101205/Ohana/src/tools/src/roc.c (modified) (4 diffs)

branches/eam_branches/ipp-20101205/Ohana/src/tools/src/roc.c

@@ -318 +318 @@
 
   scan_line (target, line);
-  myAssert (!strncmp(line, "ROC Version 0", strlen("ROC Verion 0")), "invalid ROC file or format");
+  myAssert (!strncmp(line, "ROC Version 0", strlen("ROC Verion 0")), "invalid ROC file or format in %s",targetName);
 
   scan_line (target, line);
@@ -352 +352 @@
   for (i = 0; i < Ninput; i++) {
     input[i] = fopen(inputName[i], "r");
-    myAssert (input[i], "failed to open file %s\n",inputName[i]);
+    myAssert (input[i], "failed to open file %s in %s\n",inputName[i],targetName);
   }
 
@@ -365 +365 @@
       Nread = MIN (ROC_BLOCKSIZE, sizes[i] - bytes_read[i]);
       Nbytes = fread (inputData[i], 1, Nread, input[i]);
-      myAssert (Nbytes == Nread, "failed to read data file: %s read: %d expect: %d prev_read: %d block: %d\n",inputName[i],Nbytes,Nread,(int) bytes_read[i],n);
+      myAssert (Nbytes == Nread, "failed to read data file: %s read: %d expect: %d prev_read: %d block: %d in %s\n",inputName[i],Nbytes,Nread,(int) bytes_read[i],n,targetName);
       if (Nread < ROC_BLOCKSIZE) {
         // if we have reached the end of the file, fill in the rest with NULLs
@@ -379 +379 @@
         value = value ^ inputData[i][j];
       }
-      myAssert(value == 0, "validation failed on block %d and byte %d\n",n,j);
+      myAssert(value == 0, "validation failed on block %d and byte %d in %s\n",n,j,targetName);
     }