Makefile.am.patch

   1 *** Makefile.am 2017-01-03 10:53:52.436371005 +0000
   2 --- ../../komodo-jl777/Makefile.am      2017-01-03 09:49:08.848505929 +0000
   3 ***************
   4 *** 39,58 ****
   5     $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
   6     $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
   7
   8 -
   9 - if BUILD_DARWIN
  10 - COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
  11 -   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
  12 -   baseline_filtered.info block_test_filtered.info \
  13 -   leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
  14 - #  zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
  15 - else
  16   COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
  17     leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
  18     baseline_filtered.info block_test_filtered.info \
  19     leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
  20     zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
  21 - endif
  22
  23   dist-hook:
  24         -$(MAKE) -C $(top_distdir)/src/leveldb clean
  25 --- 39,49 ----
  26 ***************
  27 *** 159,173 ****
  28   baseline.info:
  29         $(LCOV) -c -i -d $(abs_builddir)/src -o $@
  30
  31 - if BUILD_DARWIN
  32 - baseline_filtered.info: baseline.info
  33 -       $(LCOV) -r $< "/usr/include/*" \
  34 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  35 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
  36 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
  37 -                       "$(abs_builddir)/src/test/*" \
  38 -                       -o $@
  39 - else
  40   baseline_filtered.info: baseline.info
  41         $(LCOV) -r $< "/usr/include/*" \
  42                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  43 --- 150,155 ----
  44 ***************
  45 *** 177,196 ****
  46                         "$(abs_builddir)/src/gtest/*" \
  47                         "$(abs_builddir)/src/test/*" \
  48                         -o $@
  49 - endif
  50
  51   leveldb_baseline.info: baseline_filtered.info
  52         $(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@
  53
  54 - if BUILD_DARWIN
  55 - leveldb_baseline_filtered.info: leveldb_baseline.info
  56 -       $(LCOV) -r $< "/usr/include/*" \
  57 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  58 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
  59 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
  60 -                       "$(abs_builddir)/src/test/*" \
  61 -                       -o $@
  62 - else
  63   leveldb_baseline_filtered.info: leveldb_baseline.info
  64         $(LCOV) -r $< "/usr/include/*" \
  65                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  66 --- 159,168 ----
  67 ***************
  68 *** 200,206 ****
  69                         "$(abs_builddir)/src/gtest/*" \
  70                         "$(abs_builddir)/src/test/*" \
  71                         -o $@
  72 - endif
  73
  74   baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
  75         $(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
  76 --- 172,177 ----
  77 ***************
  78 *** 211,226 ****
  79         $(LCOV) -z -d $(abs_builddir)/src
  80         $(LCOV) -z -d $(abs_builddir)/src/leveldb
  81
  82 - if BUILD_DARWIN
  83   test_bitcoin_filtered.info: test_bitcoin.info
  84         $(LCOV) -r $< "/usr/include/*" \
  85                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  86                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
  87                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
  88                         "$(abs_builddir)/src/test/*" \
  89                         -o $@
  90 ! else
  91 ! test_bitcoin_filtered.info: test_bitcoin.info
  92         $(LCOV) -r $< "/usr/include/*" \
  93                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
  94                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
  95 --- 182,204 ----
  96         $(LCOV) -z -d $(abs_builddir)/src
  97         $(LCOV) -z -d $(abs_builddir)/src/leveldb
  98
  99   test_bitcoin_filtered.info: test_bitcoin.info
 100         $(LCOV) -r $< "/usr/include/*" \
 101                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
 102                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
 103                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
 104 +                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
 105 +                       "$(abs_builddir)/src/gtest/*" \
 106                         "$(abs_builddir)/src/test/*" \
 107                         -o $@
 108 !
 109 ! zcash-gtest.info: baseline_filtered_combined.info
 110 !       $(MAKE) -C src/ zcash-gtest_check
 111 !       $(LCOV) -c -d $(abs_builddir)/src -t zcash-gtest -o $@
 112 !       $(LCOV) -z -d $(abs_builddir)/src
 113 !       $(LCOV) -z -d $(abs_builddir)/src/leveldb
 114 !
 115 ! zcash-gtest_filtered.info: zcash-gtest.info
 116         $(LCOV) -r $< "/usr/include/*" \
 117                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
 118                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
 119 ***************
 120 *** 229,235 ****
 121                         "$(abs_builddir)/src/gtest/*" \
 122                         "$(abs_builddir)/src/test/*" \
 123                         -o $@
 124 - endif
 125
 126   block_test.info: test_bitcoin_filtered.info
 127         $(MKDIR_P) qa/tmp
 128 --- 207,212 ----
 129 ***************
 130 *** 238,252 ****
 131         $(LCOV) -z -d $(abs_builddir)/src
 132         $(LCOV) -z -d $(abs_builddir)/src/leveldb
 133
 134 - if BUILD_DARWIN
 135 - block_test_filtered.info: block_test.info
 136 -       $(LCOV) -r $< "/usr/include/*" \
 137 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
 138 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
 139 -                       "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
 140 -                       "$(abs_builddir)/src/test/*" \
 141 -                       -o $@
 142 - else
 143   block_test_filtered.info: block_test.info
 144         $(LCOV) -r $< "/usr/include/*" \
 145                         "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
 146 --- 215,220 ----
 147 ***************
 148 *** 256,293 ****
 149                         "$(abs_builddir)/src/gtest/*" \
 150                         "$(abs_builddir)/src/test/*" \
 151                         -o $@
 152 - endif
 153
 154   test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
 155 !        $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
 156
 157 - if ! BUILD_DARWIN
 158   zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
 159         $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
 160 - endif
 161
 162 - if BUILD_DARWIN
 163 - total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
 164 -        $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 165 - else
 166   total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
 167         $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 168 - endif
 169 -
 170
 171   test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 172 !        $(GENHTML) -s $< -o $(@D)
 173 !        @touch $@
 174
 175   total.coverage/.dirstamp: total_coverage.info
 176 !        $(GENHTML) -s $< -o $(@D)
 177 !        @touch $@
 178
 179 - if BUILD_DARWIN
 180 - cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
 181 - else
 182   cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
 183 - endif
 184
 185   endif
 186
 187 --- 224,254 ----
 188                         "$(abs_builddir)/src/gtest/*" \
 189                         "$(abs_builddir)/src/test/*" \
 190                         -o $@
 191
 192   test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
 193 !       $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
 194
 195   zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
 196         $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
 197
 198   total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
 199         $(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
 200
 201   test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
 202 !       $(GENHTML) -s $< -o $(@D)
 203 !       @touch $@
 204 !
 205 ! zcash-gtest.coverage/.dirstamp:  zcash-gtest_coverage.info
 206 !       $(GENHTML) -s $< -o $(@D)
 207 !       @touch $@
 208 !
 209 ! cov-zcash: zcash-gtest.coverage/.dirstamp
 210
 211   total.coverage/.dirstamp: total_coverage.info
 212 !       $(GENHTML) -s $< -o $(@D)
 213 !       @touch $@
 214
 215   cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
 216
 217   endif
 218