Skip to content

Commit e515007

Browse files
ingydotnetingydotnet
committed
git subrepo pull ext/test-more-bash
subrepo: subdir: "ext/test-more-bash" merged: "c7df24f" upstream: origin: "git@github.com:ingydotnet/test-more-bash.git" branch: "master" commit: "c7df24f" git-subrepo: version: "0.4.1" origin: "git@github.com:ingydotnet/git-subrepo" commit: "a04d8c2"
1 parent 914c2ae commit e515007

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+508
-189
lines changed

‎ext/test-more-bash/.gitrepo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = git@github.com:ingydotnet/test-more-bash.git
88
branch = master
9-
commit = 5c6764651bdad1379a08bfbdcec406cac5cc7dca
10-
parent = 7ea6eb9179e479ba4ddeb842ad6565164acb7043
9+
commit = c7df24fcb0814fbb62a33d92dc3c8d526ff710f0
10+
parent = 914c2ae8e3b881f62ca987c1c3343df6a034d865
1111
cmdver = 0.4.1
1212
method = merge

‎ext/test-more-bash/Changes‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
---
2+
version: 0.0.5
3+
date: Wed 11 Nov 2020 02:33:42 PM EST
4+
changes:
5+
- Refactor to modern bash
6+
---
27
version: 0.0.4
3-
date: Fri Sep 4 12:21:30 PDT 2020
8+
date: Fri Sep 4 12:26:58 2020 -0700
49
changes:
510
- Make up to date
611
- Apply a few PRs

‎ext/test-more-bash/Makefile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ NAME := test-more
22
DOC := doc/$(NAME).swim
33
MAN3 := man/man3
44

5+
DOCKER_IMAGE := ingy/bash-testing:0.0.1
6+
DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
7+
DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
8+
59
default: help
610

711
help:
@@ -11,10 +15,31 @@ help:
1115
test:
1216
prove $(PROVEOPT:%=% )test/
1317

18+
test-all: test docker-test
19+
20+
docker-test: $(DOCKER_TESTS)
21+
22+
$(DOCKER_TESTS):
23+
$(call docker-make-test,$(@:docker-test-%=%))
24+
1425
doc: ReadMe.pod $(MAN3)/$(NAME).3
1526

1627
ReadMe.pod: $(DOC)
1728
swim --to=pod --complete --wrap $< > $@
1829

1930
$(MAN3)/%.3: doc/%.swim
2031
swim --to=man $< > $@
32+
33+
define docker-make-test
34+
docker run -i -t --rm \
35+
-v $(PWD):/git-subrepo \
36+
-w /git-subrepo \
37+
$(DOCKER_IMAGE) \
38+
/bin/bash -c ' \
39+
set -x && \
40+
[[ -d /bash-$(1) ]] && \
41+
export PATH=/bash-$(1)/bin:$$PATH && \
42+
bash --version && \
43+
make test \
44+
'
45+
endef

‎ext/test-more-bash/Meta‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=meta: 0.0.2
22

33
name: test-more
4-
version: 0.0.4
4+
version: 0.0.5
55
abstract: TAP Testing for Bash
66
homepage: http://bpan.org/package/test-more/
77

@@ -16,9 +16,9 @@ author:
1616
homepage: http://ingy.net
1717

1818
requires:
19-
bash: 3.2.0
20-
bashplus: 0.0.8
21-
test-tap: 0.0.4
19+
bash: 4.4.0
20+
bashplus: 0.0.9
21+
test-tap: 0.0.5
2222
test:
2323
cmd: make test
2424
install:

‎ext/test-more-bash/ext/bashplus/.gitignore‎

Whitespace-only changes.

‎ext/test-more-bash/ext/bashplus/.gitrepo‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[subrepo]
77
remote = git@github.com:ingydotnet/bashplus.git
88
branch = master
9-
commit = ab418ed01941b5a6d97b20fa51497babafcb841f
10-
parent = 7868da5cb5e69493dc0dddc92fa48639211ae9fc
9+
commit = e49f45a1457fed3cceb15bd4a82b0f7515efd8e5
10+
parent = c978e2afd6861203138f28d0021e03fa1ffbba0c
1111
cmdver = 0.4.1
1212
method = merge

‎ext/test-more-bash/ext/bashplus/Changes‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
---
2+
version: 0.0.9
3+
date: Wed 11 Nov 2020 02:19:32 PM EST
4+
changes:
5+
- Apply shellcheck fixes
6+
- Modernize bash code
7+
---
28
version: 0.0.8
39
date: Fri Aug 21 08:00:45 PDT 2020
410
changes:

‎ext/test-more-bash/ext/bashplus/Makefile‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ INSTALL_DIR ?= test
1515
INSTALL_MAN1 ?= $(shell bpan env BPAN_MAN1)
1616
INSTALL_MAN3 ?= $(shell bpan env BPAN_MAN3)
1717

18+
DOCKER_IMAGE := ingy/bash-testing:0.0.1
19+
DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
20+
DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
21+
1822
default: help
1923

2024
help:
@@ -24,6 +28,13 @@ help:
2428
test:
2529
prove $(PROVEOPT:%=% )test/
2630

31+
test-all: test docker-test
32+
33+
docker-test: $(DOCKER_TESTS)
34+
35+
$(DOCKER_TESTS):
36+
$(call docker-make-test,$(@:docker-test-%=%))
37+
2738
install:
2839
install -C -d -m 0755 $(INSTALL_LIB)/$(INSTALL_DIR)/
2940
install -C -m 0755 $(LIB) $(INSTALL_LIB)/$(INSTALL_DIR)/
@@ -43,3 +54,17 @@ $(MAN1)/%.1: doc/%.swim
4354

4455
$(MAN3)/%.3: doc/%.swim
4556
swim --to=man $< > $@
57+
58+
define docker-make-test
59+
docker run -i -t --rm \
60+
-v $(PWD):/git-subrepo \
61+
-w /git-subrepo \
62+
$(DOCKER_IMAGE) \
63+
/bin/bash -c ' \
64+
set -x && \
65+
[[ -d /bash-$(1) ]] && \
66+
export PATH=/bash-$(1)/bin:$$PATH && \
67+
bash --version && \
68+
make test \
69+
'
70+
endef

‎ext/test-more-bash/ext/bashplus/Meta‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=meta: 0.0.2
22

33
name: bashplus
4-
version: 0.0.8
4+
version: 0.0.9
55
abstract: Modern Bash Programming
66
homepage: http://bpan.org/package/bashplus/
77

@@ -16,7 +16,7 @@ author:
1616
homepage: http://ingy.net
1717

1818
requires:
19-
bash: 3.2.0
19+
bash: 4.4.0
2020
test:
2121
cmd: make test
2222
install:

‎ext/test-more-bash/ext/bashplus/bin/bash+‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@
66
#------------------------------------------------------------------------------
77

88
set -e
9-
shopt -s compat31&>/dev/null||:
9+
shopt -s compat31 &>/dev/null || true
1010

1111
#------------------------------------------------------------------------------
1212
# Determine how `bash+` was called, and do the right thing:
1313
#------------------------------------------------------------------------------
14-
if [ "${BASH_SOURCE[0]}" != "$0" ]; then
14+
if [[ ${BASH_SOURCE[0]} != "$0" ]]; then
1515
# 'bash+' is being sourced:
16-
[[ "${BASH_SOURCE[0]}" =~ /bin/bash\\+$ ]] || {
16+
[[ ${BASH_SOURCE[0]} =~ /bin/bash\\+$ ]] || {
1717
echo "Invalid Bash+ path '${BASH_SOURCE[0]}'" 2> /dev/null
1818
exit 1
1919
}
2020
source "${BASH_SOURCE[0]%/bin/*}"/lib/bash+.bash || return $?
2121
bash+:import "$@"
2222
return $?
23+
2324
else
24-
if [ $# -eq 1 -a "$1" == --version ]; then
25-
echo 'bash+ version 0.0.8'
25+
if [[ $# -eq 1 ]] && [[ $1 == --version ]]; then
26+
echo 'bash+ version 0.0.9'
2627
else
27-
cat <<...
28+
cat <<'...'
2829
2930
Greetings modern Bash programmer. Welcome to Bash+!
3031

0 commit comments

Comments
 (0)