[Compbench-devel] CompBenchmarks++/compbenchmarks-core cloptions.cpp, 1.3, 1.4

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv9303

Modified Files:
	cloptions.cpp 
Log Message:
Updates due to changes in CBM::Benchmark::Bench() interface.
Fatal error on unrecognized option has been modified.

Index: cloptions.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/compbenchmarks-core/cloptions.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cloptions.cpp	6 Jun 2007 16:02:11 -0000	1.3
--- cloptions.cpp	6 Jun 2007 21:40:23 -0000	1.4
***************
*** 92,98 ****
    std::string str;
    if (*domain!=DomainUndef) {
!     str="Unexpected option : ";
      str+=opt;
      CBM::cbmUI->msgFatal(str);
    } else {
      *domain=value;
--- 92,102 ----
    std::string str;
    if (*domain!=DomainUndef) {
!     str="Unexpected option '";
      str+=opt;
+     str+="'";
+     parseExitValue=255;
      CBM::cbmUI->msgFatal(str);
+     cbmSystem->done();
+     exit(parseExitValue);
    } else {
      *domain=value;
***************
*** 225,230 ****
  {
    int c;
-   int                                 context;
-   CBM::Package::Status                status;
  
    CBM::Package                        *P = 0;
--- 229,232 ----
***************
*** 778,782 ****
        break;
      }
!     O=new CBM::CompilerOptions(options);
      P=B->Package();
      if (P->getStatus()<CBM::Package::Preconfigured) {
--- 780,785 ----
        break;
      }
! 
!     O=new CBM::CompilerOptions("command-line", options);
      P=B->Package();
      if (P->getStatus()<CBM::Package::Preconfigured) {
***************
*** 785,801 ****
        break;
      }
!     context=P->ContextMatches(C, O);
!     
!     status=P->getStatus();
!     if ((status>=CBM::Package::Configured) && (!context)) {
!       P->Release();
!     }
!     
!     if (!context) {
!       P->Configure(C, O);
!       P->Make(UO_force);
!       P->Test(UO_force);
!     }
!     B->Bench();
      
      parseExitValue=0;
--- 788,793 ----
        break;
      }
! 
!     B->Bench(C, O);
      
      parseExitValue=0;