From 723754add08503f4e5f0054f925068597fe5e879 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Tue, 12 Feb 2019 13:36:26 -0500 Subject: [PATCH] renamed mg tests to indicate aggressive/conservative. added rida+combo configs for aware Former-commit-id: 7851e908cacc51ce338bb455a05b8754e6d07071 --- tests/test_cmds.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/tests/test_cmds.sh b/tests/test_cmds.sh index 990226e0d..cc9c33824 100755 --- a/tests/test_cmds.sh +++ b/tests/test_cmds.sh @@ -129,8 +129,14 @@ do_tests() p1) $PSZ $progpath $protected -c p1transform=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1 ;; - mg) - $PSZ $progpath $protected -c move_globals=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1 + mga) + $PSZ $progpath $protected -c move_globals=on -o --aggressive --tempdir $temp_dir > test_${prog}.ps.log 2>&1 + ;; + rida_mga_p1) + $PSZ $progpath $protected -c rida -c move_globals=on -o --aggressive -c p1transform --tempdir $temp_dir > test_${prog}.ps.log 2>&1 + ;; + mgc) + $PSZ $progpath $protected -c move_globals=on -o --conservative --tempdir $temp_dir > test_${prog}.ps.log 2>&1 ;; mg_elfonly) $PSZ $progpath $protected -c move_globals=on -o move_globals:--elftables-only --tempdir $temp_dir > test_${prog}.ps.log 2>&1 @@ -156,9 +162,15 @@ do_tests() p1_scfi) FIX_CALLS_FIX_ALL_CALLS=1 $PSZ $progpath $protected -c p1transform=on -c selective_cfi=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1 ;; - p1_scfi_mg) + rida_p1_scfi) + FIX_CALLS_FIX_ALL_CALLS=1 $PSZ -c rida $progpath $protected -c p1transform=on -c selective_cfi=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1 + ;; + p1_scfi_mga) FIX_CALLS_FIX_ALL_CALLS=1 $PSZ $progpath $protected -c p1transform=on -c selective_cfi=on -c move_globals=on --step-option move_globals:--aggressive --tempdir $temp_dir > test_${prog}.ps.log 2>&1 ;; + rida_p1_scfi_mga) + FIX_CALLS_FIX_ALL_CALLS=1 $PSZ -c rida $progpath $protected -c p1transform=on -c selective_cfi=on -c move_globals=on --step-option move_globals:--aggressive --tempdir $temp_dir > test_${prog}.ps.log 2>&1 + ;; kill_deads) $PSZ $progpath $protected -c kill_deads=on --tempdir $temp_dir > test_${prog}.ps.log 2>&1 ;; -- GitLab