Ignore:
Timestamp:
Oct 26, 2015, 8:09:34 AM (6 years ago)
Author:
Peter
Message:

revert r3426 and some cosmetic changes (refs #794)

Location:
branches/0.13-stable/test
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/0.13-stable/test/Suite.cc

    r3417 r3431  
    4646    if (require_bam) {
    4747#ifndef YAT_HAVE_LIBBAM
    48       out() << "no libbam\n";
     48      out() << "no bam support\n";
    4949      exit (EXIT_SKIP);
    5050#endif
  • branches/0.13-stable/test/Suite.h

    r3322 r3431  
    2424*/
    2525
     26// ensure that config.h always is included first
     27#ifndef YAT_VERSION
     28#error header 'config.h' not included
     29#endif
     30
     31#include <yat/utility/config_public.h>
     32
    2633#define YAT_TEST_PROLOGUE "\n=== " << __func__ << " ===\n"
    2734
     
    3037
    3138// SKIP_BAM_TEST is defined if we should skip bam tests
    32 #ifndef HAVE_LIBBAM
    33 #define SKIP_BAM_TEST
    34 #endif
    35 #ifndef HAVE_SAMTOOLS
     39#if !defined (YAT_HAVE_LIBBAM) || !defined (HAVE_SAMTOOLS_EXECUTABLE)
    3640#define SKIP_BAM_TEST
    3741#endif
  • branches/0.13-stable/test/pileup.cc

    r3417 r3431  
    2323
    2424#include "Suite.h"
     25
     26#include <yat/utility/config_public.h>
    2527
    2628#ifdef YAT_HAVE_LIBBAM
     
    5052
    5153
    52 #ifdef YAT_HAVE_LIBBAM
    5354char seq_nt16(size_t x)
    5455{
     
    6364}
    6465
     66#ifdef YAT_HAVE_LIBBAM
    6567void test1(test::Suite& suite, const std::string& fn)
    6668{
Note: See TracChangeset for help on using the changeset viewer.