Sat May 29 21:41:32 PDT 2010

Author: ddunbar
Date: Sat May 29 23:41:32 2010
New Revision: 105149

URL: http://llvm.org/viewvc/llvm-project?rev=105149&view=rev
Log:
Hack up a bunch of tests to fix their expected output to not contain their source path. The general pattern I followed is to replace any prints of pathnames with just the basename() of the path, which should be fixed across different installations.

Modified:
    test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_manager.c
    test-suite/trunk/MultiSource/Applications/JM/ldecod/ldecod.c
    test-suite/trunk/MultiSource/Applications/JM/lencod/configfile.c
    test-suite/trunk/MultiSource/Applications/JM/lencod/lencod.c
    test-suite/trunk/MultiSource/Applications/SPASS/top.c
    test-suite/trunk/MultiSource/Applications/d/write_ctables.c
    test-suite/trunk/MultiSource/Applications/kimwitu++/main.cc
    test-suite/trunk/MultiSource/Applications/lambda-0.1.3/lambda.cc
    test-suite/trunk/MultiSource/Applications/lemon/lemon.c
    test-suite/trunk/MultiSource/Applications/viterbi/read_dmatrix.c
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/cvrin.c
    test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/main.c
    test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/pgm.c
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c
    test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/z49.c
    test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/conflicts.c
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/output.c
    test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/reader.c
    test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/store.c
    test-suite/trunk/MultiSource/Benchmarks/sim/sim.c

Modified: test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_manager.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_manager.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================

--- test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_manager.c (original)
+++ test-suite/trunk/MultiSource/Applications/ClamAV/clamscan_manager.c Sat May 29 23:41:32 2010
@@ -75,6 +75,11 @@
 #define	O_BINARY    0
 #endif
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 static int scandirs(const char *dirname, struct cl_engine *engine, const struct passwd *user, const struct optstruct *opt, const struct cl_limits *limits, int options)
 {
     return treewalk(dirname, engine, user, opt, limits, options, 1);
@@ -641,7 +646,7 @@
 	const char *virname;
 
 
-    logg("*Scanning %s\n", filename);
+    logg("*Scanning %s\n", basename(filename));
 
     if((fd = open(filename, O_RDONLY|O_BINARY)) == -1) {
 	logg("^Can't open file %s\n", filename);
@@ -657,7 +662,7 @@
 
     } else if(ret == CL_CLEAN) {
 	if(!printinfected && printclean)
-	    mprintf("%s: OK\n", filename);
+            mprintf("%s: OK\n", basename(filename));
     } else
 	if(!printinfected)
 	    logg("%s: %s\n", filename, cl_strerror(ret));

Modified: test-suite/trunk/MultiSource/Applications/JM/ldecod/ldecod.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/ldecod/ldecod.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/ldecod/ldecod.c (original)
+++ test-suite/trunk/MultiSource/Applications/JM/ldecod/ldecod.c Sat May 29 23:41:32 2010
@@ -76,6 +76,11 @@
 #define DATADECFILE "dataDec.txt"
 #define TRACEFILE   "trace_dec.txt"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 extern objectBuffer_t *erc_object_list;
 extern ercVariables_t *erc_errorVar;
 extern ColocatedParams *Co_located;
@@ -261,16 +266,16 @@
   fprintf(stdout,"----------------------------- JM %s %s -----------------------------\n", VERSION, EXT_VERSION);
   fprintf(stdout," Decoder config file                    : %s \n",config_filename);
   fprintf(stdout,"--------------------------------------------------------------------------\n");
-  fprintf(stdout," Input H.264 bitstream                  : %s \n",input->infile);
+  fprintf(stdout," Input H.264 bitstream                  : %s \n",basename(input->infile));
   fprintf(stdout," Output decoded YUV                     : %s \n",input->outfile);
   fprintf(stdout," Output status file                     : %s \n",LOGFILE);
   if ((p_ref=open(input->reffile,OPENFLAGS_READ))==-1)
   {
-    fprintf(stdout," Input reference file                   : %s does not exist \n",input->reffile);
+    fprintf(stdout," Input reference file                   : %s does not exist \n",basename(input->reffile));
     fprintf(stdout,"                                          SNR values are not available\n");
   }
   else
-    fprintf(stdout," Input reference file                   : %s \n",input->reffile);
+    fprintf(stdout," Input reference file                   : %s \n",basename(input->reffile));
 
   fprintf(stdout,"--------------------------------------------------------------------------\n");
 #ifdef _LEAKYBUCKET_

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/configfile.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/configfile.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/configfile.c (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/configfile.c Sat May 29 23:41:32 2010
@@ -68,6 +68,11 @@
 #include "configfile.h"
 #include "fmo.h"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 char *GetConfigFileContent (char *Filename);
 static void ParseContent (char *buf, int bufsize);
 static int ParameterNameToMapIndex (char *s);
@@ -161,7 +166,7 @@
       JMHelpExit();
     }
   }
-  printf ("Parsing Configfile %s", filename);
+  printf ("Parsing Configfile %s", basename(filename));
   content = GetConfigFileContent (filename);
   if (NULL==content)
     error (errortext, 300);
@@ -227,7 +232,7 @@
           *destin = '\0';
           CLcount++;
         }
-        printf ("Parsing command line string '%s'", content);
+        printf ("Parsing command line string '%s'", "IGNORED");
         ParseContent (content, strlen(content));
         free (content);
         printf ("\n");

Modified: test-suite/trunk/MultiSource/Applications/JM/lencod/lencod.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/JM/lencod/lencod.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/JM/lencod/lencod.c (original)
+++ test-suite/trunk/MultiSource/Applications/JM/lencod/lencod.c Sat May 29 23:41:32 2010
@@ -68,6 +68,11 @@
 #define VERSION "12.1"
 #define EXT_VERSION "(FRExt)"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 InputParameters inputs,      *input = &inputs;
 ImageParameters images,      *img   = &images;
 StatParameters  statistics,  *stats = &statistics;
@@ -1853,7 +1858,7 @@
     printf("------------------------------- JM %s %s --------------------------------\n",VERSION, EXT_VERSION);
   else
     printf("------------------------------- JM %s %s ------------------------------------------\n",VERSION, EXT_VERSION);
-  printf(" Input YUV file                    : %s \n",input->infile);
+  printf(" Input YUV file                    : %s \n",basename(input->infile));
   printf(" Output H.264 bitstream            : %s \n",input->outfile);
   if (p_dec != -1)
     printf(" Output YUV file                   : %s \n",input->ReconFile);

Modified: test-suite/trunk/MultiSource/Applications/SPASS/top.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/SPASS/top.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/SPASS/top.c (original)
+++ test-suite/trunk/MultiSource/Applications/SPASS/top.c Sat May 29 23:41:32 2010
@@ -73,6 +73,11 @@
 #include <stdlib.h>
 
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 /**************************************************************/
 /* Types and Variables                                        */
 /**************************************************************/
@@ -113,7 +118,7 @@
     printf("\nSPASS %s ", misc_VERSION);
     puts("\nSPASS beiseite: Ran out of time. SPASS was killed.");
     printf("Problem: %s ", 
-	   (top_InputFile != (char*)NULL ? top_InputFile : "Read from stdin."));
+	   (top_InputFile != (char*)NULL ? basename(top_InputFile) : "Read from stdin."));
     printf("\nSPASS derived %d clauses, backtracked %d clauses "
 	   "and kept %d clauses.",
 	   (*top_PROOFSEARCH == (PROOFSEARCH)NULL ? 0 : prfs_DerivedClauses(*top_PROOFSEARCH)),
@@ -1484,7 +1489,7 @@
 	fputs("Completion found.", stdout);
       }
       printf("\nProblem: %s ",
-	     (top_InputFile != (char*)NULL ? top_InputFile : "Read from stdin."));
+	     (top_InputFile != (char*)NULL ? basename(top_InputFile) : "Read from stdin."));
       if (flag_GetFlagValue(Flags, flag_PSTATISTIC)) {
 	clock_StopPassedTime(clock_OVERALL);
 	printf("\nSPASS derived %d clauses,", prfs_DerivedClauses(Search));

Modified: test-suite/trunk/MultiSource/Applications/d/write_ctables.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/d/write_ctables.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/d/write_ctables.c (original)
+++ test-suite/trunk/MultiSource/Applications/d/write_ctables.c Sat May 29 23:41:32 2010
@@ -3,6 +3,11 @@
 */
 #include "d.h"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 typedef struct ScannerBlock { 
   int state_index; 
   int scanner_index; 
@@ -558,7 +563,7 @@
 
   fprintf(fp, "{\n");
   if (g->write_line_directives)
-    fprintf(fp, "#line %d \"%s\"\n", line, pathname);
+    fprintf(fp, "#line %d \"%s\"\n", line, basename(pathname));
   c = code;
   while (*c) {
     if (*c == '$') {
@@ -630,7 +635,7 @@
 
   for (i = 0; i < g->ncode; i++) {
     if (g->write_line_directives)
-      fprintf(fp, "#line %d \"%s\"\n", g->code[i].line, g->pathname);
+      fprintf(fp, "#line %d \"%s\"\n", g->code[i].line, basename(g->pathname));
     c = g->code[i].code;
     while (*c) {
       if (*c == '$') {

Modified: test-suite/trunk/MultiSource/Applications/kimwitu++/main.cc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/kimwitu%2B%2B/main.cc?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/kimwitu++/main.cc (original)
+++ test-suite/trunk/MultiSource/Applications/kimwitu++/main.cc Sat May 29 23:41:32 2010
@@ -33,6 +33,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 #include "defs.h"
 #ifndef KIMWITUCOPYRIGHT
 # define KIMWITUCOPYRIGHT "@(#) Kimwitu++ version: (unknown) (c) 2003 Humboldt-University of Berlin"
@@ -603,7 +608,7 @@
 
 	IncludeFile( mkfunctionincname(INC_KC_FUNCTIONS))->inc_type = include_file;
 	IncludeFile( mkfunctionincname(INC_KC_FUNCTIONS_HEADER))->inc_type = include_header;
-	if (g_options.verbose) cout << " " << pg_filename->name << flush;
+	if (g_options.verbose) cout << " " << basename(pg_filename->name) << flush;
 	try {
 	    yyparse(); 
 	    FnFile( pg_filename )->fns = Thefndeclarations;

Modified: test-suite/trunk/MultiSource/Applications/lambda-0.1.3/lambda.cc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lambda-0.1.3/lambda.cc?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lambda-0.1.3/lambda.cc (original)
+++ test-suite/trunk/MultiSource/Applications/lambda-0.1.3/lambda.cc Sat May 29 23:41:32 2010
@@ -38,6 +38,11 @@
 #include <sys/param.h>
 #endif
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 int
 main(int argc, char** argv)
 {
@@ -58,7 +63,7 @@
 		char buf[MAXPATHLEN+1];
 		char* cwd = getcwd(buf,sizeof(buf)-1);
 		if( cwd ){
-			printf( "%s\n", cwd);
+                        printf( "%s\n", basename(cwd));
 		}
 	}
 	#endif

Modified: test-suite/trunk/MultiSource/Applications/lemon/lemon.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/lemon/lemon.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/lemon/lemon.c (original)
+++ test-suite/trunk/MultiSource/Applications/lemon/lemon.c Sat May 29 23:41:32 2010
@@ -34,6 +34,11 @@
 #define MAXRHS 1000
 #endif
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 static char *msort(char*,char**,int(*)(const char*,const char*));
 
 static struct action *Action_new(void);
@@ -3070,6 +3075,7 @@
 int lineno;
 char *filename;
 {
+  filename = basename(filename);
   fprintf(out,"#line %d \"",lineno);
   while( *filename ){
     if( *filename == '\\' ) putc('\\',out);
@@ -4852,12 +4858,13 @@
 			if(p == 0) {
 				char *argv_child[] = {"lemon-child","-s",argv[i],NULL};
 				/* child */
-				fprintf(stdout,"Processing %s\n",argv[i]);
+				fprintf(stdout,"Processing %s\n",basename(argv[i]));
 				exit( lemon_main(3, argv_child) );
 			}
 			while(wait(&status) == -1 && errno == EINTR) {}
 			if(status) {
-				fprintf(stderr,"Error while running on: %s\n",argv[i]);
+                                fflush(stdout);
+				fprintf(stderr,"Error while running on: %s\n",basename(argv[i]));
 			}
 		}
 	}

Modified: test-suite/trunk/MultiSource/Applications/viterbi/read_dmatrix.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/viterbi/read_dmatrix.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/viterbi/read_dmatrix.c (original)
+++ test-suite/trunk/MultiSource/Applications/viterbi/read_dmatrix.c Sat May 29 23:41:32 2010
@@ -3,12 +3,17 @@
 
 #include "common.h"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 size_t read_dmatrix(dvarray* out, const char* filename) {
     FILE* fid = fopen(filename,"rt");
     double value;
     size_t i, j, width = 0, height = 0;
 
-    printf("Opened file %s for matrix reading\n", filename);
+    printf("Opened file %s for matrix reading\n", basename(filename));
 
     fscanf(fid, "%d %d", &height, &width);
 

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/cvrin.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/cvrin.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/cvrin.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/cvrin.c Sat May 29 23:41:32 2010
@@ -8,6 +8,11 @@
 static bool line_length_error;
 static int lineno;
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 void skip_line(fpin, fpout, echo)
 register FILE *fpin, *fpout;
 register bool echo;
@@ -580,7 +585,7 @@
     symbolic_list_t *p2;
     symbolic_t *p1;
 
-    printf("# PLA is %s", PLA->filename);
+    printf("# PLA is %s", basename(PLA->filename));
     if (cube.num_binary_vars == cube.num_vars - 1)
 	printf(" with %d inputs and %d outputs\n",
 	    cube.num_binary_vars, cube.part_size[cube.num_vars - 1]);

Modified: test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/main.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/main.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/main.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MallocBench/espresso/main.c Sat May 29 23:41:32 2010
@@ -10,6 +10,11 @@
 static FILE *last_fp;
 static int input_type = FD_type;
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 main(argc, argv)
 int argc;
 char *argv[];
@@ -166,7 +171,7 @@
 	/* echo command line and arguments */
 	printf("# espresso");
 	for(i = 1; i < argc; i++) {
-	    printf(" %s", argv[i]);
+            printf(" %s", basename(argv[i]));
 	}
 	printf("\n");
 	printf("# %s\n", VERSION);

Modified: test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/pgm.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/pgm.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/pgm.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/McCat/18-imp/pgm.c Sat May 29 23:41:32 2010
@@ -29,6 +29,11 @@
 #include <math.h>
 #include "pgm.h"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 /*
 FUNCTION   : void PGM_InitImage(ImgP img, char *filename)
 DESCRIPTION: Initializes an image information object with the given filename
@@ -87,7 +92,7 @@
 {
   if (img->valid)
     {
-      printf("filename:\t%s\n", img->filename);
+      printf("filename:\t%s\n", basename(img->filename));
       printf("width   :\t%d\n", img->width);
       printf("height  :\t%d\n", img->height);
       printf("max gray:\t%d\n", img->maxgray);

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-lame/lame.c Sat May 29 23:41:32 2010
@@ -56,6 +56,11 @@
 static int mf_samples_to_encode;
 
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 
 /********************************************************************
  *   initialize internal params based on data in gf
@@ -542,8 +547,8 @@
   }
   else {
     fprintf(stderr, "Encoding %s to %s\n",
-	    (strcmp(gfp->inPath, "-")? gfp->inPath : "stdin"),
-	    (strcmp(gfp->outPath, "-")? gfp->outPath : "stdout"));
+	    (strcmp(gfp->inPath, "-")? basename(gfp->inPath) : "stdin"),
+	    (strcmp(gfp->outPath, "-")? basename(gfp->outPath) : "stdout"));
     if (gfp->VBR)
       fprintf(stderr, "Encoding as %.1fkHz VBR(q=%i) %s MPEG%i LayerIII  qval=%i\n",
 	      gfp->out_samplerate/1000.0,

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/z49.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/z49.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/z49.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/consumer-typeset/z49.c Sat May 29 23:41:32 2010
@@ -112,6 +112,11 @@
   pos = pos % ltab_size(S);						\
 }
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 static LINK_DEST_TABLE ltab_new(int newsize)
 { LINK_DEST_TABLE S;  int i;
   /* ifdebug(DMA, D, DebugRegisterUsage(MEM_LINK_TAB, 1,
@@ -531,7 +536,7 @@
 	Error(49, 5, "%s file %s lacks PostScript BeginResource comment",
 	  WARN, PosOfFile(fnum), KW_PREPEND, FileName(fnum));
       StringFPuts(buff, out_fp);
-      p2("%% %s file %s\n", KW_PREPEND, FileName(fnum));
+      p2("%% %s file %s\n", KW_PREPEND, basename(FileName(fnum)));
       while( StringFGets(buff, MAX_BUFF, fp) != NULL )
 	StringFPuts(buff, out_fp);
       p0("\n");
@@ -1328,7 +1333,7 @@
   if( prev == nilobj )
   {
     /* not used previously, so print it and remember it */
-    fprintf(out_fp, "\n[ /Dest /%s /DEST pdfmark\n", ConvertToPDFName(name));
+    fprintf(out_fp, "\n[ /Dest /%s /DEST pdfmark\n", "IGNORED");
     ltab_insert(name, &link_dest_tab);
   }
   else

Modified: test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c Sat May 29 23:41:32 2010
@@ -171,6 +171,11 @@
       
 }
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -181,7 +186,7 @@
       while(--argc > 0)
       {
             errors |= crc32file(*++argv, &crc, &charcnt);
-            printf("%08lX %7ld %s\n", crc, charcnt, *argv);
+            printf("%08lX %7ld %s\n", crc, charcnt, basename(*argv));
       }
       return(errors != 0);
 }

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/conflicts.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/conflicts.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/conflicts.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/conflicts.c Sat May 29 23:41:32 2010
@@ -366,13 +366,18 @@
 }
 
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
 
 void total_conflicts(void)
 {
   if (src_total == expected_conflicts && rrc_total == 0)
     return;
 
-  fprintf(stderr, "%s contains", infile);
+  fflush(stdout);
+  fprintf(stderr, "%s contains", basename(infile));
 
   if (src_total == 1)
     fprintf(stderr, " 1 shift/reduce conflict");

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/output.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/output.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/output.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/output.c Sat May 29 23:41:32 2010
@@ -1291,12 +1291,17 @@
 
 
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 void output_program(void)
 {
   register int c;
   extern int lineno;
 
-  fprintf(ftable, "#line %d \"%s\"\n", lineno, infile);
+  fprintf(ftable, "#line %d \"%s\"\n", lineno, basename(infile));
 
   c = getc(finput);
   while (c != EOF)

Modified: test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/reader.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/reader.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/reader.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/Prolangs-C/bison/reader.c Sat May 29 23:41:32 2010
@@ -34,6 +34,11 @@
 #include "gram.h"
 
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 #define	LTYPESTR	"\n#ifndef YYLTYPE\ntypedef\n  struct yyltype\n\
     {\n      int first_line;\n      int first_column;\n\
       int last_line;\n      int last_column;\n    }\n\
@@ -149,7 +154,7 @@
   getsym("$illegal.")->class = STOKEN;
   /* Read the declaration section.  Copy %{ ... %} groups to ftable and fdefines file.
      Also notice any %token, %left, etc. found there.  */
-  fprintf(ftable, "\n/*  A Bison parser, made from %s  */\n\n", infile);
+  fprintf(ftable, "\n/*  A Bison parser, made from %s  */\n\n", basename(infile));
   read_declarations();
   /* output the definition of YYLTYPE into the fattrs and fdefines files.  */
   output_ltype();
@@ -268,7 +273,7 @@
   register int after_percent;  /* -1 while reading a character if prev char was % */
 
   if (!nolinesflag)
-    fprintf(fattrs, "#line %d \"%s\"\n", lineno, infile);
+    fprintf(fattrs, "#line %d \"%s\"\n", lineno, basename(infile));
 
   after_percent = 0;
 
@@ -605,7 +610,7 @@
   typed = 1;
 
   if (!nolinesflag)
-    fprintf(fattrs, "\n#line %d \"%s\"\n", lineno, infile);
+    fprintf(fattrs, "\n#line %d \"%s\"\n", lineno, basename(infile));
   else
     fprintf(fattrs, "\n");
 
@@ -797,7 +802,7 @@
 
   fprintf(fguard, "\ncase %d:\n", nrules);
   if (!nolinesflag)
-    fprintf(fguard, "#line %d \"%s\"\n", lineno, infile);
+    fprintf(fguard, "#line %d \"%s\"\n", lineno, basename(infile));
   putc('{', fguard);
 
   count = 0;
@@ -1009,7 +1014,7 @@
 
   fprintf(faction, "\ncase %d:\n", nrules);
   if (!nolinesflag)
-    fprintf(faction, "#line %d \"%s\"\n", lineno, infile);
+    fprintf(faction, "#line %d \"%s\"\n", lineno, basename(infile));
   putc('{', faction);
 
   count = 1;

Modified: test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/store.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/store.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/store.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/mediabench/mpeg2/mpeg2dec/store.c Sat May 29 23:41:32 2010
@@ -34,6 +34,11 @@
 #include "config.h"
 #include "global.h"
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 /* private prototypes */
 static void store_one _ANSI_ARGS_((char *outname, unsigned char *src[],
   int offset, int incr, int height));
@@ -155,7 +160,7 @@
   unsigned char *p;
 
   if (!Quiet_Flag)
-    fprintf(stderr,"saving %s\n",name);
+    fprintf(stderr,"saving %s\n",basename(name));
 
   if ((outfile = open(name,O_CREAT|O_TRUNC|O_WRONLY|O_BINARY,0666))==-1)
   {
@@ -217,7 +222,7 @@
   strcat(outname,".SIF");
 
   if (!Quiet_Flag)
-    fprintf(stderr,"saving %s\n",outname);
+    fprintf(stderr,"saving %s\n",basename(outname));
 
   if ((outfile = open(outname,O_CREAT|O_TRUNC|O_WRONLY|O_BINARY,0666))==-1)
   {
@@ -310,7 +315,7 @@
   strcat(outname,tgaflag ? ".tga" : ".ppm");
 
   if (!Quiet_Flag)
-    fprintf(stderr,"saving %s\n",outname);
+    fprintf(stderr,"saving %s\n",basename(outname));
 
   if ((outfile = open(outname,O_CREAT|O_TRUNC|O_WRONLY|O_BINARY,0666))==-1)
   {

Modified: test-suite/trunk/MultiSource/Benchmarks/sim/sim.c
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/sim/sim.c?rev=105149&r1=105148&r2=105149&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/sim/sim.c (original)
+++ test-suite/trunk/MultiSource/Benchmarks/sim/sim.c Sat May 29 23:41:32 2010
@@ -92,6 +92,11 @@
 #undef UNIX
 #endif
 
+static const char *basename(const char *str) {
+  const char *base = strrchr(str, '/');
+  return base ? base+1 : str;
+}
+
 /* ckalloc - allocate space; check for success */
 #if 1
 #define ckalloc(x) malloc(x)
@@ -380,9 +385,9 @@
 	for ( i = 0; i < K ; i++ )
 	   LIST[i] = ( vertexptr ) ckalloc( (long) sizeof(vertex));
 
-	printf("                 Upper Sequence : %s\n", name1);
+	printf("                 Upper Sequence : %s\n", basename(name1));
 	printf("                         Length : %d\n", M);
-	printf("                 Lower Sequence : %s\n", name2);
+	printf("                 Lower Sequence : %s\n", basename(name2));
 	printf("                         Length : %d\n", N);
 
 	numnode = min = 0;



