[llvm-commits] [test-suite] r105459 - in /test-suite/trunk/MultiSource/Benchmarks/PAQ8p: Makefile paq8p.cpp

[Jakob Stoklund Olesen]

Author: stoklund
Date: Thu Jun  3 23:38:36 2010
New Revision: 105459

URL: http://llvm.org/viewvc/llvm-project?rev=105459&view=rev
Log:
Try again to fix this test. Don't copy the input file, but change the test to
use an output file named basename(input).paq8p.

Modified:
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile?rev=105459&r1=105458&r2=105459&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile Thu Jun  3 23:38:36 2010
@@ -4,16 +4,9 @@
 CPPFLAGS += -DNOASM -DLLVM
 LDFLAGS = -lstdc++ -lm
 ifdef SMALL_PROBLEM_SIZE
-RUN_OPTIONS = -1 Output/file1.in
+RUN_OPTIONS = -1 $(PROJ_SRC_DIR)/file1.in
 else
-RUN_OPTIONS = -4 Output/file1.in
+RUN_OPTIONS = -4 $(PROJ_SRC_DIR)/file1.in
 endif
 
 include $(LEVEL)/MultiSource/Makefile.multisrc
-
-# The program insists on writing its output next to the input, but PROJ_SRC_DIR
-# may not be writable.
-Output/file1.in:
-	$(VERB) cp $(PROJ_SRC_DIR)/file1.in $@
-
-Output/paq8p.out-llc Output/paq8p.out-nat Output/paq8p.out-simple Output/paq8p.out-llc-beta Output/paq8p.out-opt-beta: Output/file1.in

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp?rev=105459&r1=105458&r2=105459&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp Thu Jun  3 23:38:36 2010
@@ -4086,7 +4086,7 @@
 
     // Decompress
     if (f) {
-      printf("Extracting %s %ld -> ", mybasename(filename), filesize);
+      printf("Extracting %s %ld -> ", filename, filesize);
       for (int i=0; i<filesize; ++i) {
         printStatus(i);
         putc(decode(en), f);
@@ -4098,7 +4098,7 @@
     // Can't create, discard data
     else {
       perror(filename);
-      printf("Skipping %s %ld -> ", mybasename(filename), filesize);
+      printf("Skipping %s %ld -> ", filename, filesize);
       for (int i=0; i<filesize; ++i) {
         printStatus(i);
         decode(en);
@@ -4290,7 +4290,7 @@
 
     // Compress or decompress?  Get archive name
     Mode mode=COMPRESS;
-    String archiveName(argv[1]);
+    String archiveName(mybasename(argv[1]));
     {
       const int prognamesize=strlen(PROGNAME);
       const int arg1size=strlen(argv[1]);
@@ -4342,7 +4342,7 @@
       fprintf(archive, PROGNAME " -%d\r\n%s\x1A",
         level, header_string.c_str());
       printf("Creating archive %s with %d file(s)...\n",
-        mybasename(archiveName.c_str()), files);
+        archiveName.c_str(), files);
 
       // Fill fname[files], fsize[files] with input filenames and sizes
       fname.resize(files);
@@ -4378,7 +4378,7 @@
       // Fill fname[files], fsize[files] with output file names and sizes
       while (getline(archive)) ++files;  // count files
       printf("Extracting %d file(s) from %s -%d\n", files,
-        mybasename(archiveName.c_str()), level);
+        archiveName.c_str(), level);
       long header_size=ftell(archive);
       filenames.resize(header_size+4);  // copy of header
       rewind(archive);