Skip to content

Commit

Permalink
[configure] Don't export systemtap vars to shell
Browse files Browse the repository at this point in the history
They're only needed in C++.

- Tweak error message
- Test extended globs more
  • Loading branch information
Andy C committed Jan 5, 2025
1 parent c1eb56c commit 0cc995b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
7 changes: 0 additions & 7 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -310,13 +310,6 @@ echo_shell_vars() {
echo 'READLINE_DIR='
fi

# TODO: I don't think we need this in shell
if test "$have_systemtap_sdt" = 1; then
echo 'HAVE_SYSTEMTAP_SDT=1'
else
echo 'HAVE_SYSTEMTAP_SDT='
fi

echo "PREFIX=$FLAG_prefix"
echo "DATAROOTDIR=$FLAG_datarootdir"

Expand Down
2 changes: 1 addition & 1 deletion cpp/core.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ List<PasswdEntry*>* GetAllUsers() {
#else
fprintf(
stderr,
"Oils compiled without libc *pwent() functions. Can't list users.\n");
"oils: Can't list users because *pwent() functions weren't found in libc\n");
return NewList<PasswdEntry*>();
#endif
}
Expand Down
7 changes: 5 additions & 2 deletions test/configure-effects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ test-osh() {
# GLOB_PERIOD
$osh -x -c 'shopt -s dotglob'

# FNM_EXTMATCH
# FNM_EXTMATCH in glob()
# Hm this will works
$osh -x -c 'echo */@(*.bash|*.asdl)'
$osh -x -c 'echo */*/t@(*.asdl|*.sh)'

# FNM_EXTMATCH in fnmatch()
$osh -x -c 'case foo.py in @(*.asdl|*.py)) echo py ;; esac'

# HAVE_PWENT
$osh -x -c 'compgen -A user'
Expand Down

0 comments on commit 0cc995b

Please sign in to comment.