dwarflint: Move test-coverage.cc to tests subdir

diff --git a/dwarflint/Makefile.am b/dwarflint/Makefile.am
index b8ad6b02b7d4ba4f21b61a72bb7ecc1303f3d9e9..844f83d8686fa8526e1fe034c0229e03eac45b42 100644 (file)
--- a/dwarflint/Makefile.am
+++ b/dwarflint/Makefile.am
@@ -35,7 +35,8 @@ AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw
 
 no_mudflap.os = -fmudflap
 
-bin_PROGRAMS = dwarflint test-coverage
+bin_PROGRAMS = dwarflint
+noinst_PROGRAMS = tests/test-coverage
 
 dwarflint_SOURCES = \
        addr-record.cc addr-record.hh \
@@ -86,7 +87,7 @@ dwarflint_SOURCES = \
        \
        ../src/dwarfstrings.c
 
-test_coverage_SOURCES = test-coverage.cc coverage.cc pri.cc \
+tests_test_coverage_SOURCES = tests/test-coverage.cc coverage.cc pri.cc \
        ../src/dwarfstrings.c
 
 EXTRA_TESTS = tests/run-debug_abbrev-duplicate-attribute.sh \
@@ -99,7 +100,7 @@ EXTRA_TESTS = tests/run-debug_abbrev-duplicate-attribute.sh \
        tests/run-libdl-2.12.so.debug.sh
 
 TESTS = $(EXTRA_TESTS) \
-       test-coverage
+       tests/test-coverage
 
 EXTRA_DIST = $(EXTRA_TESTS) \
        tests/debug_abbrev-duplicate-attribute.bz2 \
@@ -143,7 +144,7 @@ libeu = ../lib/libeu.a
 libdwpp = ../libdw/libdwpp.a $(libdw)
 
 dwarflint_LDADD  = $(libebl) $(libelf) $(libdwpp) $(libeu) $(libmudflap) -ldl
-test_coverage_LDADD  = $(libebl) $(libelf) $(libdwpp) $(libeu) $(libmudflap) -ldl
+tests_test_coverage_LDADD  = $(libebl) $(libelf) $(libdwpp) $(libeu) $(libmudflap) -ldl
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
        bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \

diff --git a/dwarflint/coverage.hh b/dwarflint/coverage.hh
index 381d5216eb88712a985a304431876b75e7698c27..57897fefa301d361076cc672262550b85102f078 100644 (file)
--- a/dwarflint/coverage.hh
+++ b/dwarflint/coverage.hh
@@ -30,6 +30,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
+#include <cstdint>
 
 /* Functions and data structures for handling of address range
    coverage.  We use that to find holes of unused bytes in DWARF

diff --git a/dwarflint/pri.hh b/dwarflint/pri.hh
index 1f4ad6ae2f6f1d333a9780a59cb5f400cbb4ae63..b9806dfa1d4918ca38459fff30cb643935695d61 100644 (file)
--- a/dwarflint/pri.hh
+++ b/dwarflint/pri.hh
@@ -26,7 +26,7 @@
 #ifndef DWARFLINT_PRI_H
 #define DWARFLINT_PRI_H
 
-#include <libdw.h>
+#include "../libdw/libdw.h"
 #include <string>
 
 #define PRI_NOT_ENOUGH ": not enough data for %s.\n"

diff --git a/dwarflint/test-coverage.cc b/dwarflint/tests/test-coverage.cc
similarity index 98%
rename from dwarflint/test-coverage.cc
rename to dwarflint/tests/test-coverage.cc
index a68cf6d7d1a2652675122802adbf502561604da7..3d3add0aefd28032befa48ad8c321ee862766f3e 100644 (file)
--- a/dwarflint/test-coverage.cc
+++ b/dwarflint/tests/test-coverage.cc
@@ -1,8 +1,8 @@
 #include <iostream>
 #include <cstdlib>
 #include <cassert>
-#include "coverage.hh"
-#include "pri.hh"
+#include "../coverage.hh"
+#include "../pri.hh"
 
 bool fail = false;