← Back to branch summary

~zorba-coders/zorba/bug-1189807

« back to all changes in this revision

Viewing changes to test/driver/testdriver_mt.cpp

  • Committer: chillery+launchpad at lambda
  • Date: 2013-08-07 08:08:22 UTC
  • mfrom: (11561.2.27 lp_zorba)
  • Revision ID: chillery+launchpad@lambda.nu-20130807080822-zp0y6pbxqeux4y5n
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/driver/testdriver_mt.cpp
412
412
  std::auto_ptr<zorba::TestSchemeURIMapper> dmapper;
413
413
  std::auto_ptr<zorba::TestURLResolver> tresolver;
414
414
 
 
415
  DriverContext driverContext(zorba);
 
416
  driverContext.theRbktSourceDir = rbkt_src_dir;
 
417
  driverContext.theRbktBinaryDir = rbkt_bin_dir;
 
418
 
415
419
  while (1)
416
420
  {
417
421
    Specification querySpec;
428
432
 
429
433
    bool failure = false;
430
434
 
431
 
    DriverContext driverContext;
432
 
    driverContext.theEngine = zorba;
433
 
    driverContext.theRbktSourceDir = rbkt_src_dir;
434
 
    driverContext.theRbktBinaryDir = rbkt_bin_dir;
435
435
    driverContext.theSpec = &querySpec;
 
436
    driverContext.theURIMappers.clear();
 
437
    driverContext.theURLResolvers.clear();
436
438
 
437
439
    // Choose a query to run. If no query is available, the thread finishes. 
438
440
    // To choose the next query, the whole query container must be locked.
560
562
      new zorba::TestModuleURIMapper(mod_map_file.c_str(), testName, false));
561
563
 
562
564
      cmapper.reset(
563
 
      new zorba::TestCollectionURIMapper(col_map_file.c_str(), rbkt_src_dir));
 
565
      new zorba::TestCollectionURIMapper(driverContext.theXmlDataMgr,
 
566
                                         col_map_file.c_str(),
 
567
                                         rbkt_src_dir));
564
568
 
565
569
      addURIMapper(driverContext, sctx, smapper.get());
566
570
      addURIMapper(driverContext, sctx, mmapper.get());
735
739
    {
736
740
      bool foundRefFile = false;
737
741
      ulong i;
738
 
      for (i = 0; i < refFilePaths.size(); i++) 
 
742
      for (i = 0; i < refFilePaths.size(); i++)
739
743
      {
 
744
        foundRefFile = false;
 
745
 
740
746
#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
741
747
        std::string refFilePath = refFilePaths[i].file_string();
742
748
        std::string resFilePath = resultFilePath.file_string();