From a577f39745dc32ca9bb63eb88cbb40aaa3187bbb Mon Sep 17 00:00:00 2001
From: Aiethel <xkorenc1@fi.muni.cz>
Date: Wed, 30 Oct 2019 18:35:59 +0100
Subject: [PATCH] Test suite hotfix (#601)

* Add explicit targets to unit tests from src

* run_tests.py no longer crashes when program does not generate expected file as output.

* Fix bunch of issues if file is not lifted/recompiled properly

* Gzip empty command line arguments test case
---
 tests/integration_tests/run_tests.py          | 28 +++++++++++++------
 tests/integration_tests/src/all_data_array.c  |  2 ++
 tests/integration_tests/src/all_globals.c     |  2 ++
 tests/integration_tests/src/all_stringpool.c  |  2 ++
 tests/integration_tests/src/all_switch.c      |  2 ++
 tests/integration_tests/src/array.c           |  2 ++
 tests/integration_tests/src/bubblesort.c      |  2 ++
 tests/integration_tests/src/calc.c            |  2 ++
 tests/integration_tests/src/complex_double.c  |  2 ++
 tests/integration_tests/src/complex_float.c   |  2 ++
 .../src/complex_long_double.c                 |  2 ++
 tests/integration_tests/src/complex_numbers.c |  2 ++
 tests/integration_tests/src/dot_product.c     |  2 ++
 tests/integration_tests/src/fibonacci.c       |  2 ++
 tests/integration_tests/src/fmodf.cpp         |  2 ++
 .../src/global-ctors-dtors-return-type.c      |  2 ++
 .../src/global-ctors-dtors.c                  |  2 ++
 tests/integration_tests/src/global_array.c    |  2 ++
 tests/integration_tests/src/global_var.cpp    |  2 ++
 tests/integration_tests/src/globals_and_io.c  |  2 ++
 tests/integration_tests/src/hello_c.c         |  2 ++
 tests/integration_tests/src/hello_cpp.cpp     |  2 ++
 tests/integration_tests/src/helloworld.c      |  2 ++
 .../integration_tests/src/iostream_basics.cpp |  2 ++
 tests/integration_tests/src/local-array.c     |  2 ++
 .../src/matrix_vector_mult.c                  |  2 ++
 tests/integration_tests/src/open_close_dir.c  |  2 ++
 tests/integration_tests/src/operator_new.cpp  |  2 ++
 tests/integration_tests/src/pointers.c        |  2 ++
 tests/integration_tests/src/printf_floats.cpp |  2 ++
 tests/integration_tests/src/pthread.cpp       |  2 ++
 tests/integration_tests/src/qsort.c           |  2 ++
 .../src/qsort_function_ptrs.cpp               |  2 ++
 tests/integration_tests/src/rand_and_strtol.c |  2 ++
 tests/integration_tests/src/readdir.c         |  2 ++
 tests/integration_tests/src/simple_array.c    |  2 ++
 tests/integration_tests/src/simple_exit.c     |  2 ++
 tests/integration_tests/src/simple_for_loop.c |  2 ++
 tests/integration_tests/src/simple_main.c     | 10 ++-----
 tests/integration_tests/src/struct.c          |  2 ++
 .../integration_tests/src/struct_func_ptr.cpp |  2 ++
 .../src/template_function_ptrs.cpp            |  2 ++
 tests/integration_tests/src/virtual.cpp       |  2 ++
 .../integration_tests/src/virtual_simpler.cpp |  2 ++
 tests/integration_tests/src/x86_bts.c         |  2 ++
 45 files changed, 107 insertions(+), 17 deletions(-)

diff --git a/tests/integration_tests/run_tests.py b/tests/integration_tests/run_tests.py
index f9d2e4b25..ef67a5ab4 100755
--- a/tests/integration_tests/run_tests.py
+++ b/tests/integration_tests/run_tests.py
@@ -135,9 +135,14 @@ def check_arguments(args):
 
 
 def exec_and_log_fail(args):
-    pipes = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
-    std_out, std_err = pipes.communicate()
-    ret_code = pipes.returncode
+    try:
+        pipes = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
+        std_out, std_err = pipes.communicate(timeout = 180)
+        ret_code = pipes.returncode
+    except subprocess.TimeoutExpired as e:
+        pipes.terminate()
+        print("Timeout!")
+        return False
 
     if ret_code:
         print("** stdout:")
@@ -262,7 +267,7 @@ def parallel_lift(*t_args):
         res = config.lift(test_dir)
         # TODO: More fine grained log
         if res != Config.Result.SUCCESS:
-            results[self.id] = result_data.TCData(self.id, self.recompiled, self.binary)
+            results[config.id] = result_data.TCData(config.id,config.recompiled, config.binary)
 
 def get_configs(directory, allowed_tags, batched):
     result = []
@@ -400,11 +405,14 @@ class Runner:
             base_name = os.path.basename(name)
             actual = os.path.join(self.t_recompiled, base_name)
             expected = os.path.join(self.t_bin, base_name)
-            if not filecmp.cmp(expected, actual):
-                counterexample += 'Files do not match: ' + basename + '\n'
+            try:
+                if not filecmp.cmp(expected, actual):
+                    counterexample += 'Files do not match: ' + base_name + '\n'
+                    correct = correct and False
+            except FileNotFoundError as e:
+                counterexample += 'File {} not found/produced! '.format(base_name)
                 correct = correct and False
 
-
         result = result_data.RUN if correct else result_data.FAIL
         return (result, counterexample)
 
@@ -443,8 +451,9 @@ class Runner:
             actual = _exec(self, self.t_recompiled, [filename] + detail.cmd, stdin)
             return self.compare(expected, actual, files)
         except subprocess.TimeoutExpired as e:
-            return result_data.TIMEOUT
-
+            return result_data.TIMEOUT, "Timeout"
+        except FileNotFoundError as e:
+            return result_data.ERROR, "File not found"
 
     def run(self, detail):
         self.set_up()
@@ -511,6 +520,7 @@ g_complex_test = {
         TestDetails(['-l', './dec_data.txt.gz']).set_files(['inputs/dec_data.txt.gz']),
         TestDetails(['-df', './dec_data.txt.gz']).set_files(['inputs/dec_data.txt.gz']).\
                     set_check(['dec_data.txt']),
+        TestDetails(['']),
     ],
 
     "cat":
diff --git a/tests/integration_tests/src/all_data_array.c b/tests/integration_tests/src/all_data_array.c
index 1cb655112..f926f6374 100644
--- a/tests/integration_tests/src/all_data_array.c
+++ b/tests/integration_tests/src/all_data_array.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/all_globals.c b/tests/integration_tests/src/all_globals.c
index af39c1ebb..fb462a3bb 100644
--- a/tests/integration_tests/src/all_globals.c
+++ b/tests/integration_tests/src/all_globals.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/all_stringpool.c b/tests/integration_tests/src/all_stringpool.c
index 23b99b78c..e67947128 100644
--- a/tests/integration_tests/src/all_stringpool.c
+++ b/tests/integration_tests/src/all_stringpool.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/all_switch.c b/tests/integration_tests/src/all_switch.c
index 9f93fbc53..af51969c0 100644
--- a/tests/integration_tests/src/all_switch.c
+++ b/tests/integration_tests/src/all_switch.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: 12 */
 /* TEST: 15 */
 /*
diff --git a/tests/integration_tests/src/array.c b/tests/integration_tests/src/array.c
index 7728521fc..95769e359 100644
--- a/tests/integration_tests/src/array.c
+++ b/tests/integration_tests/src/array.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/bubblesort.c b/tests/integration_tests/src/bubblesort.c
index 2c068bdff..d23372d51 100644
--- a/tests/integration_tests/src/bubblesort.c
+++ b/tests/integration_tests/src/bubblesort.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: 12 */
 /* TEST: 14 */
 /* TEST: 0 */
diff --git a/tests/integration_tests/src/calc.c b/tests/integration_tests/src/calc.c
index 7ae97e4a9..271d13047 100644
--- a/tests/integration_tests/src/calc.c
+++ b/tests/integration_tests/src/calc.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: */
 /* STDIN: Finputs/calc_input1.txt */
 /* TEST: */
diff --git a/tests/integration_tests/src/complex_double.c b/tests/integration_tests/src/complex_double.c
index 39580367e..9cbde45f9 100644
--- a/tests/integration_tests/src/complex_double.c
+++ b/tests/integration_tests/src/complex_double.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* LD_OPTS: -lm */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
diff --git a/tests/integration_tests/src/complex_float.c b/tests/integration_tests/src/complex_float.c
index b63394016..decaecadf 100644
--- a/tests/integration_tests/src/complex_float.c
+++ b/tests/integration_tests/src/complex_float.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* LD_OPTS: -lm */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
diff --git a/tests/integration_tests/src/complex_long_double.c b/tests/integration_tests/src/complex_long_double.c
index 6266297be..36e396675 100644
--- a/tests/integration_tests/src/complex_long_double.c
+++ b/tests/integration_tests/src/complex_long_double.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* LD_OPTS: -lm */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
diff --git a/tests/integration_tests/src/complex_numbers.c b/tests/integration_tests/src/complex_numbers.c
index 8b035b625..55b64f710 100644
--- a/tests/integration_tests/src/complex_numbers.c
+++ b/tests/integration_tests/src/complex_numbers.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* LD_OPTS: -lm */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
diff --git a/tests/integration_tests/src/dot_product.c b/tests/integration_tests/src/dot_product.c
index 01269a358..6bdf181e3 100644
--- a/tests/integration_tests/src/dot_product.c
+++ b/tests/integration_tests/src/dot_product.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/fibonacci.c b/tests/integration_tests/src/fibonacci.c
index 872a5a489..625fee4cd 100644
--- a/tests/integration_tests/src/fibonacci.c
+++ b/tests/integration_tests/src/fibonacci.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: 12 */
 /* TEST: 26 */
 /* TEST: 2 */
diff --git a/tests/integration_tests/src/fmodf.cpp b/tests/integration_tests/src/fmodf.cpp
index 0f68083dd..2b320a45d 100644
--- a/tests/integration_tests/src/fmodf.cpp
+++ b/tests/integration_tests/src/fmodf.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/global-ctors-dtors-return-type.c b/tests/integration_tests/src/global-ctors-dtors-return-type.c
index 87ef84064..cb3dbae61 100644
--- a/tests/integration_tests/src/global-ctors-dtors-return-type.c
+++ b/tests/integration_tests/src/global-ctors-dtors-return-type.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/tests/integration_tests/src/global-ctors-dtors.c b/tests/integration_tests/src/global-ctors-dtors.c
index 0a77862d2..5f0d696e7 100644
--- a/tests/integration_tests/src/global-ctors-dtors.c
+++ b/tests/integration_tests/src/global-ctors-dtors.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 #include <assert.h>
 #include <stdio.h>
 
diff --git a/tests/integration_tests/src/global_array.c b/tests/integration_tests/src/global_array.c
index 3d14e472e..9927d98ab 100644
--- a/tests/integration_tests/src/global_array.c
+++ b/tests/integration_tests/src/global_array.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/global_var.cpp b/tests/integration_tests/src/global_var.cpp
index 21e49edaa..da031daec 100644
--- a/tests/integration_tests/src/global_var.cpp
+++ b/tests/integration_tests/src/global_var.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2017 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/globals_and_io.c b/tests/integration_tests/src/globals_and_io.c
index 13efc9b1f..55ac66d0b 100644
--- a/tests/integration_tests/src/globals_and_io.c
+++ b/tests/integration_tests/src/globals_and_io.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/hello_c.c b/tests/integration_tests/src/hello_c.c
index 5bf725789..83c436cce 100644
--- a/tests/integration_tests/src/hello_c.c
+++ b/tests/integration_tests/src/hello_c.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2019 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/hello_cpp.cpp b/tests/integration_tests/src/hello_cpp.cpp
index 5f124ac46..d2d0b6bac 100644
--- a/tests/integration_tests/src/hello_cpp.cpp
+++ b/tests/integration_tests/src/hello_cpp.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2019 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/helloworld.c b/tests/integration_tests/src/helloworld.c
index 4c284a5ab..33555b845 100644
--- a/tests/integration_tests/src/helloworld.c
+++ b/tests/integration_tests/src/helloworld.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/iostream_basics.cpp b/tests/integration_tests/src/iostream_basics.cpp
index bd27b8c3c..9dc89278b 100644
--- a/tests/integration_tests/src/iostream_basics.cpp
+++ b/tests/integration_tests/src/iostream_basics.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/local-array.c b/tests/integration_tests/src/local-array.c
index 981fa1c74..fc1418c7c 100644
--- a/tests/integration_tests/src/local-array.c
+++ b/tests/integration_tests/src/local-array.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/matrix_vector_mult.c b/tests/integration_tests/src/matrix_vector_mult.c
index aee8ba238..f41c88cbb 100644
--- a/tests/integration_tests/src/matrix_vector_mult.c
+++ b/tests/integration_tests/src/matrix_vector_mult.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 #include <stdio.h>
 
 static const int A [] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 };
diff --git a/tests/integration_tests/src/open_close_dir.c b/tests/integration_tests/src/open_close_dir.c
index f0b138cc8..6476934ab 100644
--- a/tests/integration_tests/src/open_close_dir.c
+++ b/tests/integration_tests/src/open_close_dir.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: /usr */
 /* TEST: /eqeqeqwe */
 /*
diff --git a/tests/integration_tests/src/operator_new.cpp b/tests/integration_tests/src/operator_new.cpp
index 5db41b994..a07e6df97 100644
--- a/tests/integration_tests/src/operator_new.cpp
+++ b/tests/integration_tests/src/operator_new.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/pointers.c b/tests/integration_tests/src/pointers.c
index 6f3e90b89..190a2c17e 100644
--- a/tests/integration_tests/src/pointers.c
+++ b/tests/integration_tests/src/pointers.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/printf_floats.cpp b/tests/integration_tests/src/printf_floats.cpp
index d74cf468a..f646e4e8e 100644
--- a/tests/integration_tests/src/printf_floats.cpp
+++ b/tests/integration_tests/src/printf_floats.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/pthread.cpp b/tests/integration_tests/src/pthread.cpp
index 7622039be..d31b01f11 100644
--- a/tests/integration_tests/src/pthread.cpp
+++ b/tests/integration_tests/src/pthread.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* LD_OPTS: -lpthread */
 /*
  * Copyright (c) 2017 Trail of Bits, Inc.
diff --git a/tests/integration_tests/src/qsort.c b/tests/integration_tests/src/qsort.c
index 731351f50..2e2ca0a4b 100644
--- a/tests/integration_tests/src/qsort.c
+++ b/tests/integration_tests/src/qsort.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/qsort_function_ptrs.cpp b/tests/integration_tests/src/qsort_function_ptrs.cpp
index 3545c4723..1522b1ed2 100644
--- a/tests/integration_tests/src/qsort_function_ptrs.cpp
+++ b/tests/integration_tests/src/qsort_function_ptrs.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: 23 */
 /* TEST: 43 */
 /* TEST: 435 */
diff --git a/tests/integration_tests/src/rand_and_strtol.c b/tests/integration_tests/src/rand_and_strtol.c
index 24df5c325..7d61cc24d 100644
--- a/tests/integration_tests/src/rand_and_strtol.c
+++ b/tests/integration_tests/src/rand_and_strtol.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/readdir.c b/tests/integration_tests/src/readdir.c
index cb1e88375..0934cbbf9 100644
--- a/tests/integration_tests/src/readdir.c
+++ b/tests/integration_tests/src/readdir.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: readdir.c */
 /* TEST: /tmp */
 /* TEST: file-that-does-not-exist */
diff --git a/tests/integration_tests/src/simple_array.c b/tests/integration_tests/src/simple_array.c
index e10c5540c..1471b0add 100644
--- a/tests/integration_tests/src/simple_array.c
+++ b/tests/integration_tests/src/simple_array.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/simple_exit.c b/tests/integration_tests/src/simple_exit.c
index f7e9d0684..307375be7 100644
--- a/tests/integration_tests/src/simple_exit.c
+++ b/tests/integration_tests/src/simple_exit.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/simple_for_loop.c b/tests/integration_tests/src/simple_for_loop.c
index fe8539dca..853c68f09 100644
--- a/tests/integration_tests/src/simple_for_loop.c
+++ b/tests/integration_tests/src/simple_for_loop.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/simple_main.c b/tests/integration_tests/src/simple_main.c
index 17d4f2d04..3d46d3d69 100644
--- a/tests/integration_tests/src/simple_main.c
+++ b/tests/integration_tests/src/simple_main.c
@@ -1,12 +1,6 @@
 /* TAGS: min c */
-/* CC_OPTS: */
-/* LD_OPTS: */
-/* LIFT_OPTS: EXP +explicit_args +explicit_args_count 8 !abi_libraries */
-/* TEST: --help */
-/* STDIN: F/inputs.txt */
-/* TEST: --version */
-/* TEST: --extract nonsense.txt */
-/* STDIN: Hello World\nThis Should Be Together */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/struct.c b/tests/integration_tests/src/struct.c
index 4af84ce76..9e81519df 100644
--- a/tests/integration_tests/src/struct.c
+++ b/tests/integration_tests/src/struct.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/struct_func_ptr.cpp b/tests/integration_tests/src/struct_func_ptr.cpp
index e0294a875..39c4f0005 100644
--- a/tests/integration_tests/src/struct_func_ptr.cpp
+++ b/tests/integration_tests/src/struct_func_ptr.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: */
 /* STDIN: 4\n4\n */
 /* TEST: */
diff --git a/tests/integration_tests/src/template_function_ptrs.cpp b/tests/integration_tests/src/template_function_ptrs.cpp
index 7a62bfb40..b244e8173 100644
--- a/tests/integration_tests/src/template_function_ptrs.cpp
+++ b/tests/integration_tests/src/template_function_ptrs.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /* TEST: 42 */
 /* TEST: -543 */
 /* TEST: 21 */
diff --git a/tests/integration_tests/src/virtual.cpp b/tests/integration_tests/src/virtual.cpp
index 4c982da40..f194b984d 100644
--- a/tests/integration_tests/src/virtual.cpp
+++ b/tests/integration_tests/src/virtual.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/virtual_simpler.cpp b/tests/integration_tests/src/virtual_simpler.cpp
index 5563f6175..3e6dc566a 100644
--- a/tests/integration_tests/src/virtual_simpler.cpp
+++ b/tests/integration_tests/src/virtual_simpler.cpp
@@ -1,4 +1,6 @@
 /* TAGS: min cpp */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *
diff --git a/tests/integration_tests/src/x86_bts.c b/tests/integration_tests/src/x86_bts.c
index 7999832dc..1f43f9442 100644
--- a/tests/integration_tests/src/x86_bts.c
+++ b/tests/integration_tests/src/x86_bts.c
@@ -1,4 +1,6 @@
 /* TAGS: min c */
+/* LIFT_OPTS: explicit +--explicit_args +--explicit_args_count 8 */
+/* LIFT_OPTS: default */
 /*
  * Copyright (c) 2018 Trail of Bits, Inc.
  *