set -e doesn't catch failures inside <()

[overonion] / reverse_test.c

diff --git a/reverse_test.c b/reverse_test.c
index 30aff32d4d4153231ce510eadd83e5c9105d755c..46c7a97c40cc1884eee448356f632b0ea4b38a2c 100644 (file)
--- a/reverse_test.c
+++ b/reverse_test.c
@@ -1,4 +1,5 @@
 #include "reverse_lib.h"
 #include "reverse_lib.h"

+#include "temp_file.h"

 
 #include <err.h>
 #include <stdio.h>
 
 #include <err.h>
 #include <stdio.h>


@@ -7,16 +8,12 @@
 #include <sysexits.h>
 #include <unistd.h>
 
 #include <sysexits.h>
 #include <unistd.h>
 

-static const char test_file[] = "reverse.c";
-

 /* Reverse input_file.  Dump the result in a temporary file.  Return the temp
  * file's name.  The caller must free the filename. */
 char* reverse_to_temp_file(const char* input_file) {
 /* Reverse input_file.  Dump the result in a temporary file.  Return the temp
  * file's name.  The caller must free the filename. */
 char* reverse_to_temp_file(const char* input_file) {

-  char* temp_filename = strdup("/tmp/reverse_test.XXXXXX");
-  int fd = mkstemp(temp_filename);
-  if (fd == -1) err(EX_IOERR, "Couldn't make a temporary file");
-  FILE* f = fdopen(fd, "w");
-  if (f == NULL) err(EX_IOERR, "Couldn't open temporary file");
+  char* temp_filename;
+  FILE* f;
+  make_temporary_file(&temp_filename, &f);

   reverse_file(input_file, f);
   if (fclose(f) == EOF) err(EX_IOERR, "Couldn't close temporary file");
   return temp_filename;
   reverse_file(input_file, f);
   if (fclose(f) == EOF) err(EX_IOERR, "Couldn't close temporary file");
   return temp_filename;


@@ -46,11 +43,11 @@ void compare(const char* filename1, const char* filename2) {
   if (fclose(f2) != 0) err(EX_IOERR, "Couldn't close file %s", filename2);
 }
 
   if (fclose(f2) != 0) err(EX_IOERR, "Couldn't close file %s", filename2);
 }
 

-void test_reverse_twice_from_files_is_the_same() {
-  char* intermediate = reverse_to_temp_file(test_file);
+void test_reverse_twice_from_files_is_the_same(const char* test_filename) {
+  char* intermediate = reverse_to_temp_file(test_filename);

   char* back_to_normal = reverse_to_temp_file(intermediate);
 
   char* back_to_normal = reverse_to_temp_file(intermediate);
 

-  compare(test_file, back_to_normal);
+  compare(test_filename, back_to_normal);

 
   if (unlink(intermediate) == -1) err(EX_IOERR, "Couldn't remove intermediate temp file");
   if (unlink(back_to_normal) == -1) err(EX_IOERR, "Couldn't remove twice-reversed temp file");
 
   if (unlink(intermediate) == -1) err(EX_IOERR, "Couldn't remove intermediate temp file");
   if (unlink(back_to_normal) == -1) err(EX_IOERR, "Couldn't remove twice-reversed temp file");


@@ -58,7 +55,7 @@ void test_reverse_twice_from_files_is_the_same() {
   free(back_to_normal);
 }
 
   free(back_to_normal);
 }
 

-void test_reverse_from_file_then_from_stream_is_the_same() {
+void test_reverse_from_file_then_from_stream_is_the_same(const char* test_filename) {

   int pipefd[2];
   if (pipe(pipefd) == -1) err(EX_OSERR, "Couldn't create pipe");
 
   int pipefd[2];
   if (pipe(pipefd) == -1) err(EX_OSERR, "Couldn't create pipe");
 


@@ -68,29 +65,35 @@ void test_reverse_from_file_then_from_stream_is_the_same() {
     if (close(pipefd[0]) == -1) err(EX_OSERR, "Couldn't close unneeded pipe descriptor");
     FILE* to_second = fdopen(pipefd[1], "w");
     if (to_second == NULL) err(EX_IOERR, "Couldn't open pipe for writing");
     if (close(pipefd[0]) == -1) err(EX_OSERR, "Couldn't close unneeded pipe descriptor");
     FILE* to_second = fdopen(pipefd[1], "w");
     if (to_second == NULL) err(EX_IOERR, "Couldn't open pipe for writing");

-    reverse_file(test_file, to_second);
+    reverse_file(test_filename, to_second);

     exit(0);
   }
   if (close(pipefd[1]) == -1) err(EX_OSERR, "Couldn't close unneeded pipe descriptor");
   FILE* from_first = fdopen(pipefd[0], "r");
   if (from_first == NULL) err(EX_IOERR, "Couldn't open pipe for reading");
     exit(0);
   }
   if (close(pipefd[1]) == -1) err(EX_OSERR, "Couldn't close unneeded pipe descriptor");
   FILE* from_first = fdopen(pipefd[0], "r");
   if (from_first == NULL) err(EX_IOERR, "Couldn't open pipe for reading");

-  char* out_temp_filename = strdup("/tmp/reverse_test.XXXXXX");
-  int out_fd = mkstemp(out_temp_filename);
-  if (out_fd == -1) err(EX_IOERR, "Couldn't make a temporary file");
-  FILE* out_file = fdopen(out_fd, "w");
-  if (out_file == NULL) err(EX_IOERR, "Couldn't open temporary file");
+  char* out_temp_filename;
+  FILE* out_file;
+  make_temporary_file(&out_temp_filename, &out_file);

   reverse_stream(from_first, out_file);
   if (fclose(out_file) == EOF) err(EX_IOERR, "Couldn't close temporary file");
 
   reverse_stream(from_first, out_file);
   if (fclose(out_file) == EOF) err(EX_IOERR, "Couldn't close temporary file");
 

-  compare(test_file, out_temp_filename);
+  compare(test_filename, out_temp_filename);

 
   if (unlink(out_temp_filename) == -1) err(EX_IOERR, "Couldn't remove temp output file");
   free(out_temp_filename);
 }
 
 
   if (unlink(out_temp_filename) == -1) err(EX_IOERR, "Couldn't remove temp output file");
   free(out_temp_filename);
 }
 

-int main() {
-  test_reverse_twice_from_files_is_the_same();
-  test_reverse_from_file_then_from_stream_is_the_same();
+int main(int argc, char** argv) {
+  char* test_filename = "reverse.c";
+  if (argc > 2) {
+    errx(EX_USAGE, "usage: reverse_test [datafile]");
+  } else if (argc == 2) {
+    test_filename = argv[1];
+  }
+
+  test_reverse_twice_from_files_is_the_same(test_filename);
+  test_reverse_from_file_then_from_stream_is_the_same(test_filename);
+

   puts("PASS");
   return 0;
 }
   puts("PASS");
   return 0;
 }