[test suite] minor 're-run make' bug fix for perl FKO module installa…

…tion
mrash · Dec 9, 2012 · 59fe047 · 59fe047
1 parent 5f598bb
commit 59fe047
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/test/test-fwknop.pl b/test/test-fwknop.pl
@@ -2863,15 +2863,23 @@ ()
 
     chdir '../perl/FKO' or die $!;
 
-    &run_cmd("make clean", $cmd_out_tmp,
+    &run_cmd("make clean", $cmd_out_tmp, "../../test/$curr_test_file")
-            "../../test/$curr_test_file");
+        if -e 'Makefile' or -e 'Makefile.old';
+
     &run_cmd("perl Makefile.PL PREFIX=../../test/$perl_mod_fko_dir " .
         "LIB=../../test/$perl_mod_fko_dir", $cmd_out_tmp,
         "../../test/$curr_test_file");
-    &run_cmd('make', $cmd_out_tmp,
+
-        "../../test/$curr_test_file");
+    &run_cmd('make', $cmd_out_tmp, "../../test/$curr_test_file");
-    &run_cmd('make install', $cmd_out_tmp,
+
-        "../../test/$curr_test_file");
+    if (&file_find_regex([qr/rerun\sthe\smake\scommand/],
+            $MATCH_ALL, "../../test/$curr_test_file")) {
+        &run_cmd('touch Makefile.PL', $cmd_out_tmp, "../../test/$curr_test_file");
+        &run_cmd('touch Makefile', $cmd_out_tmp, "../../test/$curr_test_file");
+        &run_cmd('make', $cmd_out_tmp, "../../test/$curr_test_file");
+    }
+
+    &run_cmd('make install', $cmd_out_tmp, "../../test/$curr_test_file");
 
     chdir $curr_pwd or die $!;