Check all properties with property option

regression/cbmc/Multiple_Properties1/main.c

@@ -0,0 +1,14 @@
+int main () {
+  int x, y;
+  __CPROVER_assume(x>=100 && y<=1000 & x>y+2);
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  y=0;
+  assert(x>y);  
+
+  return 0;
+}

regression/cbmc/Multiple_Properties1/test.desc

@@ -0,0 +1,10 @@
+CORE
+main.c
+--property main.assertion.1 --property main.assertion.3
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED
+^.*main.assertion.1.*SUCCESS
+^.*main.assertion.3.*FAILURE
+--
+^warning: ignoring

regression/cbmc/Multiple_Properties2/main.c

@@ -0,0 +1,14 @@
+int main () {
+  int x, y;
+  __CPROVER_assume(x>=100 && y<=1000 & x>y+2);
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  y=0;
+  assert(x>y);  
+
+  return 0;
+}

regression/cbmc/Multiple_Properties2/test.desc

@@ -0,0 +1,11 @@
+CORE
+main.c
+--property main.assertion.1,main.assertion.3,main.assertion.4
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED
+^.*main.assertion.1.*SUCCESS
+^.*main.assertion.3.*FAILURE
+^.*main.assertion.4.*SUCCESS
+--
+^warning: ignoring

regression/cbmc/Multiple_Properties3/main.c

@@ -0,0 +1,14 @@
+int main () {
+  int x, y;
+  __CPROVER_assume(x>=100 && y<=1000 & x>y+2);
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  x--;
+  assert(x>y);  
+  y=0;
+  assert(x>y);  
+
+  return 0;
+}

regression/cbmc/Multiple_Properties3/test.desc

@@ -0,0 +1,9 @@
+CORE
+main.c
+--property main.assertion.3
+^EXIT=10$
+^SIGNAL=0$
+^VERIFICATION FAILED
+^.*main.assertion.3.*FAILURE
+--
+^warning: ignoring

src/cbmc/cbmc_parse_options.cpp

@@ -181,16 +181,14 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
     options.set_option("simplify", true);
 
   if(cmdline.isset("stop-on-fail") ||
-     cmdline.isset("property") ||
      cmdline.isset("dimacs") ||
      cmdline.isset("outfile"))
     options.set_option("stop-on-fail", true);
   else
     options.set_option("stop-on-fail", false);
 
   if(cmdline.isset("trace") ||
-     cmdline.isset("stop-on-fail") ||
-     cmdline.isset("property"))
+     cmdline.isset("stop-on-fail"))
     options.set_option("trace", true);
 
   if(cmdline.isset("localize-faults"))
@@ -595,10 +593,12 @@ bool cbmc_parse_optionst::set_properties(goto_functionst &goto_functions)
   try
   {
     if(cmdline.isset("claim")) // will go away
-      ::set_properties(goto_functions, cmdline.get_values("claim"));
+      ::set_properties(goto_functions, 
+                       cmdline.get_comma_separated_values("claim"));
 
     if(cmdline.isset("property")) // use this one
-      ::set_properties(goto_functions, cmdline.get_values("property"));
+      ::set_properties(goto_functions, 
+                       cmdline.get_comma_separated_values("property"));
   }
 
   catch(const char *e)

src/util/cmdline.cpp

@@ -220,6 +220,38 @@ const std::list<std::string>& cmdlinet::get_values(const std::string &option) co
 
 /*******************************************************************\
 
+Function: cmdlinet::get_comma_separated_values
+
+  Inputs:
+
+ Outputs:
+
+ Purpose:
+
+\*******************************************************************/
+
+const std::list<std::string> cmdlinet::get_comma_separated_values(
+  const std::string &option) const
+{
+  int i=getoptnr(option);
+  assert(i>=0);
+  std::list<std::string> values;
+  for(const auto &value : options[i].values)
+  {
+    std::string::size_type length=value.length();
+    for(std::string::size_type idx=0; idx<length; idx++)
+    {
+      std::string::size_type next=value.find(",", idx);
+      values.push_back(value.substr(idx, next-idx));
+      if(next==std::string::npos) break;
+      idx=next;
+    }
+  }
+  return values;
+}
+
+/*******************************************************************\
+
 Function: cmdlinet::getoptnr
 
   Inputs:

src/util/cmdline.h

@@ -23,6 +23,8 @@ class cmdlinet
 
   const std::list<std::string> &get_values(const std::string &option) const;
   const std::list<std::string> &get_values(char option) const;
+  const std::list<std::string> get_comma_separated_values(
+    const std::string &option) const;
 
   virtual bool isset(char option) const;
   virtual bool isset(const char *option) const;