Skip to content

Commit

Permalink
Add pre-release banner UNLESS in test suite
Browse files Browse the repository at this point in the history
A previous commit added a pre-release banner.  The commit message
said testing was decommissioned, but that was not the case; there
were simply widespread failures.  A later commit instituted some
mechanisms to filter out the banner, but they did not cover every
case, resulting in at least one known test FAIL.

Suppress the banner when the test suite is being run.  Remove the
filtering mechanisms.

Orabug: 31694125
Signed-off-by: Eugene Loh <eugene.loh@oracle.com>
Reviewed-by: Nick Alcock <nick.alcock@oracle.com>
  • Loading branch information
euloh authored and kvanhees committed Apr 9, 2021
1 parent 2f3ec65 commit b61229c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
5 changes: 3 additions & 2 deletions cmd/dtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -926,8 +926,9 @@ main(int argc, char *argv[])
g_pname = basename(argv[0]);

/* Temporary banner. */
printf("DTrace %s [Pre-Release with limited functionality]\n",
_DT_VERSION);
if (getenv("_DTRACE_TESTING") == NULL)
printf("DTrace %s [Pre-Release with limited functionality]\n",
_DT_VERSION);

if (argc == 1)
return usage(stderr);
Expand Down
7 changes: 2 additions & 5 deletions runtest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,7 @@ postprocess()
local final=$3
local retval=0

grep -v "^DTrace [^\[]* \[Pre-Release with limited functionality\]$" $output > $tmpdir/pp.out
cp -f $tmpdir/pp.out $output
cp -f $output $tmpdir/pp.out

# Postprocess the output, if need be.
if [[ -x $postprocessor ]]; then
Expand Down Expand Up @@ -584,9 +583,7 @@ for dt in $dtrace; do
fi

# Write out a list of loaded providers.
DTRACE_DEBUG= $dt -l | \
grep -v "^DTrace [^\[]* \[Pre-Release with limited functionality\]$" | \
tail -n +2 | awk '{print $2;}' | sort -u > $tmpdir/providers
DTRACE_DEBUG= $dt -l | tail -n +2 | awk '{print $2;}' | sort -u > $tmpdir/providers

unset LD_LIBRARY_PATH
break
Expand Down

0 comments on commit b61229c

Please sign in to comment.