| 1 |
commit: 8bb26aedded1daafbe7dfb2e16e0ae262600c4ef |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 2 03:46:44 2013 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 2 18:30:18 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gcc-config.git;a=commit;h=8bb26aed |
| 7 |
|
| 8 |
compile gcc-config into .gcc-config so we can test it properly |
| 9 |
|
| 10 |
Otherwise, it means we can't sed certain values in a way which we |
| 11 |
then attempt to test. e.g. EPREFIX. |
| 12 |
|
| 13 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 14 |
|
| 15 |
--- |
| 16 |
.gitignore | 1 + |
| 17 |
Makefile | 19 +++++++++++-------- |
| 18 |
tests/args/test.bad | 2 +- |
| 19 |
tests/run_tests | 3 ++- |
| 20 |
4 files changed, 15 insertions(+), 10 deletions(-) |
| 21 |
|
| 22 |
diff --git a/.gitignore b/.gitignore |
| 23 |
index 96dd0d5..23938ed 100644 |
| 24 |
--- a/.gitignore |
| 25 |
+++ b/.gitignore |
| 26 |
@@ -9,4 +9,5 @@ a.out |
| 27 |
|
| 28 |
/gcc-config-*.tar.* |
| 29 |
|
| 30 |
+/.gcc-config |
| 31 |
/wrapper |
| 32 |
|
| 33 |
diff --git a/Makefile b/Makefile |
| 34 |
index 85ac80d..409d7b0 100644 |
| 35 |
--- a/Makefile |
| 36 |
+++ b/Makefile |
| 37 |
@@ -14,21 +14,24 @@ LIBEXECDIR = $(LIBDIR)/misc |
| 38 |
MKDIR_P = mkdir -p -m 755 |
| 39 |
INSTALL_EXE = install -m 755 |
| 40 |
|
| 41 |
-all: wrapper |
| 42 |
+all: .gcc-config wrapper |
| 43 |
|
| 44 |
clean: |
| 45 |
- rm -f wrapper *.o core |
| 46 |
+ rm -f .gcc-config wrapper *.o core |
| 47 |
|
| 48 |
-install: all |
| 49 |
- $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBEXECDIR) |
| 50 |
- $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/$(PN) |
| 51 |
+.gcc-config: gcc-config |
| 52 |
sed \ |
| 53 |
-e 's:@GENTOO_LIBDIR@:$(SUBLIBDIR):g' \ |
| 54 |
-e 's:@PV@:$(PV):g' \ |
| 55 |
- gcc-config > $(DESTDIR)$(BINDIR)/gcc-config |
| 56 |
- chmod a+rx $(DESTDIR)$(BINDIR)/gcc-config |
| 57 |
+ $< > $@ |
| 58 |
+ chmod a+rx $@ |
| 59 |
+ |
| 60 |
+install: all |
| 61 |
+ $(MKDIR_P) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBEXECDIR) |
| 62 |
+ $(INSTALL_EXE) wrapper $(DESTDIR)$(LIBEXECDIR)/$(PN) |
| 63 |
+ $(INSTALL_EXE) .gcc-config $(DESTDIR)$(BINDIR)/gcc-config |
| 64 |
|
| 65 |
-test check: |
| 66 |
+test check: .gcc-config |
| 67 |
cd tests && ./run_tests |
| 68 |
|
| 69 |
dist: |
| 70 |
|
| 71 |
diff --git a/tests/args/test.bad b/tests/args/test.bad |
| 72 |
index d8a9df2..80a646a 100644 |
| 73 |
--- a/tests/args/test.bad |
| 74 |
+++ b/tests/args/test.bad |
| 75 |
@@ -9,4 +9,4 @@ for f in "${flags[@]}" ; do |
| 76 |
gcc-config ${f} && exit 1 |
| 77 |
done |
| 78 |
|
| 79 |
-exec gcc-config -h >/dev/null |
| 80 |
+gcc-config -h >/dev/null |
| 81 |
|
| 82 |
diff --git a/tests/run_tests b/tests/run_tests |
| 83 |
index b0a45c0..2ff7d77 100755 |
| 84 |
--- a/tests/run_tests |
| 85 |
+++ b/tests/run_tests |
| 86 |
@@ -22,7 +22,7 @@ vars=( CHOST GCC_CONFIG ROOT TROOT NOCOLOR RC_NOCOLOR ) |
| 87 |
unset ${vars[@]} |
| 88 |
|
| 89 |
TROOT=${PWD} |
| 90 |
-GCC_CONFIG="${TROOT}/../gcc-config" |
| 91 |
+GCC_CONFIG="${TROOT}/../.gcc-config" |
| 92 |
if ! "${GCC_CONFIG}" --help >/dev/null ; then |
| 93 |
die "could not find gcc-config in ${TROOT}/../" |
| 94 |
fi |
| 95 |
@@ -86,6 +86,7 @@ for t in "$@" ; do |
| 96 |
cd "${ROOT}" |
| 97 |
$(for v in PATH ${vars[@]} ; do printf '%s="%s"\n' ${v} "${!v}" ; done) |
| 98 |
export ${vars[@]} |
| 99 |
+ gcc-config() { bash -c ". \${GCC_CONFIG}" gcc-config "\$@" ; } |
| 100 |
. ./${test} |
| 101 |
EOF |
| 102 |
chmod a+rx "${r}" |
Archives