cex: also include in the report on --report=counterexamples

And let --report=all include the counterexamples.

* src/getargs.h, src/getargs.c (report_cex): New.
* src/main.c: Compute counterexamples when -rcex is specified.
* src/print.c: Include the counterexamples when -rcex is specified.

* tests/conflicts.at, tests/existing.at, tests/local.at: Adjust.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index 18b6cc19..c0176c29 100644
--- a/src/main.c
+++ b/src/main.c
@@ -146,7 +146,8 @@ main (int argc, char *argv[])
       conflicts_update_state_numbers (old_to_new, nstates_old);
       free (old_to_new);
     }
-  if (warning_is_enabled (Wcounterexamples))
+  if (report_flag & report_cex
+      || warning_is_enabled (Wcounterexamples))
     counterexample_init ();
   conflicts_print ();
   timevar_pop (tv_conflicts);