From: Petr Machata <pmachata@redhat.com>
Date: Fri, 22 Oct 2010 13:55:36 +0000 (+0200)
Subject: dwarflint: Move test-coverage.cc to tests subdir
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da3bdedff7b6d68b7ec8e3e9ac51279a566061d2;p=thirdparty%2Felfutils.git

dwarflint: Move test-coverage.cc to tests subdir
---

diff --git a/dwarflint/Makefile.am b/dwarflint/Makefile.am
index b8ad6b02b..844f83d86 100644
--- 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 381d5216e..57897fefa 100644
--- 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 1f4ad6ae2..b9806dfa1 100644
--- 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 a68cf6d7d..3d3add0ae 100644
--- 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;