Merge pull request #842 from scop/test/shadow-deprecated-dir

scop · web-flow · commit 7b5d158576f3 · 2022-11-20T13:05:55.000+02:00
test: create shadow completions dir for deprecated in-tree completions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -35,6 +35,13 @@ repos:
         files: ^test/t/.+\.py$
         pass_filenames: false
 
+      - id: update-test-deprecated-links
+        name: update-test-deprecated-links
+        language: script
+        entry: test/deprecated/update-deprecated-links
+        files: ^completions/_
+        pass_filenames: false
+
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
diff --git a/configure.ac b/configure.ac
@@ -17,6 +17,8 @@ completions/Makefile
 doc/Makefile
 helpers/Makefile
 test/Makefile
+test/deprecated/Makefile
+test/deprecated/completions/Makefile
 test/t/Makefile
 test/t/unit/Makefile
 ])
diff --git a/test/Makefile.am b/test/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = t
+SUBDIRS = deprecated t
 
 EXTRA_DIST = config \
 	     fixtures \
diff --git a/test/config/bashrc b/test/config/bashrc
@@ -33,12 +33,10 @@ export BASH_COMPLETION_USER_FILE=/dev/null
 # ...and avoid stuff in BASH_COMPLETION_USER_DIR and system install locations
 # overriding in-tree completions. Setting the user dir would otherwise suffice,
 # but simple xspec completions are only installed if a separate one is not
-# found in any completion dirs. Therefore we also point the "system" dirs to
-# locations that should not yield valid completions and helpers paths either.
-export BASH_COMPLETION_USER_DIR=$(
-    cd "$SRCDIR/.." || exit 1
-    pwd
-)
+# found in *any* completion dirs, and we want to use our "shadow" completion
+# dir with which we cause loading of our in-tree deprecated completions
+# instead of possibly (system-)installed upstream ones.
+export BASH_COMPLETION_USER_DIR="$SRCDIRABS/deprecated"
 # /var/empty isn't necessarily actually always empty :P
 export BASH_COMPLETION_COMPAT_DIR=/var/empty/bash_completion.d
 export BASH_COMPLETION_COMPAT_IGNORE='*'
diff --git a/test/deprecated/Makefile.am b/test/deprecated/Makefile.am
@@ -0,0 +1,7 @@
+SUBDIRS = completions
+
+EXTRA_DIST = \
+	update-deprecated-links
+
+update:
+	./update-deprecated-links
diff --git a/test/deprecated/completions/Makefile.am b/test/deprecated/completions/Makefile.am
@@ -0,0 +1,35 @@
+EXTRA_DIST = \
+	adb \
+	cal \
+	chfn \
+	chsh \
+	dmesg \
+	eject \
+	hexdump \
+	hwclock \
+	ionice \
+	look \
+	mock \
+	modules \
+	mount \
+	mount.linux \
+	newgrp \
+	nmcli \
+	op \
+	renice \
+	repomanage \
+	reptyr \
+	rfkill \
+	rtcwake \
+	runuser \
+	slackpkg \
+	su \
+	svn \
+	svnadmin \
+	svnlook \
+	udevadm \
+	umount \
+	umount.linux \
+	write \
+	xm \
+	yum
diff --git a/test/deprecated/completions/README.md b/test/deprecated/completions/README.md
@@ -0,0 +1,8 @@
+# test/deprecated/completions
+
+This directory should contain a non-underscore prefixed symlink to
+corresponding underscore prefixed, deprecated completions we have in the tree.
+
+The test suite sets up loading of completions so that this dir is preferred
+over system install locations, in order to test our deprecated in-tree
+completions over possibly installed non-deprecated out-of-tree ones.
diff --git a/test/deprecated/completions/adb b/test/deprecated/completions/adb
@@ -0,0 +1 @@
+../../../completions/_adb
diff --git a/test/deprecated/completions/cal b/test/deprecated/completions/cal
@@ -0,0 +1 @@
+../../../completions/_cal
diff --git a/test/deprecated/completions/chfn b/test/deprecated/completions/chfn
@@ -0,0 +1 @@
+../../../completions/_chfn
diff --git a/test/deprecated/completions/chsh b/test/deprecated/completions/chsh
@@ -0,0 +1 @@
+../../../completions/_chsh
diff --git a/test/deprecated/completions/dmesg b/test/deprecated/completions/dmesg
@@ -0,0 +1 @@
+../../../completions/_dmesg
diff --git a/test/deprecated/completions/eject b/test/deprecated/completions/eject
@@ -0,0 +1 @@
+../../../completions/_eject
diff --git a/test/deprecated/completions/hexdump b/test/deprecated/completions/hexdump
@@ -0,0 +1 @@
+../../../completions/_hexdump
diff --git a/test/deprecated/completions/hwclock b/test/deprecated/completions/hwclock
@@ -0,0 +1 @@
+../../../completions/_hwclock
diff --git a/test/deprecated/completions/ionice b/test/deprecated/completions/ionice
@@ -0,0 +1 @@
+../../../completions/_ionice
diff --git a/test/deprecated/completions/look b/test/deprecated/completions/look
@@ -0,0 +1 @@
+../../../completions/_look
diff --git a/test/deprecated/completions/mock b/test/deprecated/completions/mock
@@ -0,0 +1 @@
+../../../completions/_mock
diff --git a/test/deprecated/completions/modules b/test/deprecated/completions/modules
@@ -0,0 +1 @@
+../../../completions/_modules
diff --git a/test/deprecated/completions/mount b/test/deprecated/completions/mount
@@ -0,0 +1 @@
+../../../completions/_mount
diff --git a/test/deprecated/completions/mount.linux b/test/deprecated/completions/mount.linux
@@ -0,0 +1 @@
+../../../completions/_mount.linux
diff --git a/test/deprecated/completions/newgrp b/test/deprecated/completions/newgrp
@@ -0,0 +1 @@
+../../../completions/_newgrp
diff --git a/test/deprecated/completions/nmcli b/test/deprecated/completions/nmcli
@@ -0,0 +1 @@
+../../../completions/_nmcli
diff --git a/test/deprecated/completions/op b/test/deprecated/completions/op
@@ -0,0 +1 @@
+../../../completions/_op
diff --git a/test/deprecated/completions/renice b/test/deprecated/completions/renice
@@ -0,0 +1 @@
+../../../completions/_renice
diff --git a/test/deprecated/completions/repomanage b/test/deprecated/completions/repomanage
@@ -0,0 +1 @@
+../../../completions/_repomanage
diff --git a/test/deprecated/completions/reptyr b/test/deprecated/completions/reptyr
@@ -0,0 +1 @@
+../../../completions/_reptyr
diff --git a/test/deprecated/completions/rfkill b/test/deprecated/completions/rfkill
@@ -0,0 +1 @@
+../../../completions/_rfkill
diff --git a/test/deprecated/completions/rtcwake b/test/deprecated/completions/rtcwake
@@ -0,0 +1 @@
+../../../completions/_rtcwake
diff --git a/test/deprecated/completions/runuser b/test/deprecated/completions/runuser
@@ -0,0 +1 @@
+../../../completions/_runuser
diff --git a/test/deprecated/completions/slackpkg b/test/deprecated/completions/slackpkg
@@ -0,0 +1 @@
+../../../completions/_slackpkg
diff --git a/test/deprecated/completions/su b/test/deprecated/completions/su
@@ -0,0 +1 @@
+../../../completions/_su
diff --git a/test/deprecated/completions/svn b/test/deprecated/completions/svn
@@ -0,0 +1 @@
+../../../completions/_svn
diff --git a/test/deprecated/completions/svnadmin b/test/deprecated/completions/svnadmin
@@ -0,0 +1 @@
+../../../completions/_svnadmin
diff --git a/test/deprecated/completions/svnlook b/test/deprecated/completions/svnlook
@@ -0,0 +1 @@
+../../../completions/_svnlook
diff --git a/test/deprecated/completions/udevadm b/test/deprecated/completions/udevadm
@@ -0,0 +1 @@
+../../../completions/_udevadm
diff --git a/test/deprecated/completions/umount b/test/deprecated/completions/umount
@@ -0,0 +1 @@
+../../../completions/_umount
diff --git a/test/deprecated/completions/umount.linux b/test/deprecated/completions/umount.linux
@@ -0,0 +1 @@
+../../../completions/_umount.linux
diff --git a/test/deprecated/completions/write b/test/deprecated/completions/write
@@ -0,0 +1 @@
+../../../completions/_write
diff --git a/test/deprecated/completions/xm b/test/deprecated/completions/xm
@@ -0,0 +1 @@
+../../../completions/_xm
diff --git a/test/deprecated/completions/yum b/test/deprecated/completions/yum
@@ -0,0 +1 @@
+../../../completions/_yum
diff --git a/test/deprecated/update-deprecated-links b/test/deprecated/update-deprecated-links
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -euo pipefail
+
+cd "$(dirname "$0")/completions"
+for f in *; do
+    case $f in
+        Makefile* | README.md) ;;
+        *) git rm -f $f ;;
+    esac
+done
+for f in ../../../completions/_*; do
+    ln -sf $f ${f##*/_}
+    git add --verbose ${f##*/_}
+done

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SUBDIRS = t`
	`1`	`+SUBDIRS = deprecated t`
`2`	`2`
`3`	`3`	`EXTRA_DIST = config \`
`4`	`4`	`fixtures \`