From 353c8e0d9330407571c3ab24844a07ea5d6b2f7f Mon Sep 17 00:00:00 2001
From: Sergey Kolosov <skolosov@redhat.com>
Date: Fri, 13 Jan 2023 22:20:25 +0100
Subject: [PATCH] CI Tests: updates Regression/bz464146-sp-corruption to use
 actual beakerlib functions

---
 .../bz464146-sp-corruption/runtest.sh         | 75 +++++++++----------
 .../bz464146-sp-corruption/testit.c           |  3 +-
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/tests/Regression/bz464146-sp-corruption/runtest.sh b/tests/Regression/bz464146-sp-corruption/runtest.sh
index 3a39322..b511b7d 100755
--- a/tests/Regression/bz464146-sp-corruption/runtest.sh
+++ b/tests/Regression/bz464146-sp-corruption/runtest.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
 # runtest.sh - bz464146-sp-corruption - Bugzilla(s) 464146
 # Author: Petr Muller <pmuller@redhat.com>
 # Location: /tools/glibc/Regression/bz464146-sp-corruption/runtest.sh
@@ -18,50 +20,43 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-PACKAGE=glibc
-
-# Include rhts environment
+# Include Beaker environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
-rlStartJournal
 
-######################
-# Prepare environment 
-######################
-rlPhaseStartSetup Preparation
-  rlAssertRpm ${PACKAGE}
-  ARCH=`uname -m`
-  if [ "$ARCH" == "ia64" -o "$ARCH" == "aarch64" -o "$ARCH" == "ppc64le" ]
-  then
-    FLAGS=""
-  else
-    FLAGS="-m64"
-  fi
-  rlRun "gcc $FLAGS testit.c -o testit -lpthread" 0 "Compiling the testcase"
+PACKAGE="glibc"
+TESTPROG="testit"
 
-rlPhaseEnd
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm ${PACKAGE}
+        rlRun "TESTTMPDIR=$(mktemp -d)"
+        rlRun "cp ${TESTPROG}.c $TESTTMPDIR"
+        rlRun "pushd $TESTTMPDIR"
 
-######################
-# Begin Test-Case
-######################
-rlPhaseStartTest Test
-  output=`mktemp`
-  ./testit > $output
-  RC=$?
+        ARCH=`uname -m`
+        if [ "$ARCH" == "ia64" -o "$ARCH" == "aarch64" -o "$ARCH" == "ppc64le" ]
+        then
+            FLAGS=""
+        else
+            FLAGS="-m64"
+        fi
+    rlPhaseEnd
 
-  rlAssert0 "Testing for success of the testcases" $RC
-  rlAssertNotEquals "Testing for segfault (bug 464146)" $RC 139
-  rlAssertEquals "Testing for correct output - output should contain 1 line" `cat $output | wc -l` 1
-  cat $output > /tmp/mineminemine
-  rlAssertGrep "received \"Hello World\!\"" /tmp/mineminemine
-rlPhaseEnd
-
-######################
-# Clean after the test
-######################
-rlPhaseStartCleanup Clean-Up
-  rlRun "rm -f $output testit"
-  rlCreateLogFromJournal > ${OUTPUTFILE}
-  rlCompareJournalWithRCW
-rlPhaseEnd
+    rlPhaseStartTest Test
+        rlRun "gcc $FLAGS ${TESTPROG}.c -o ${TESTPROG} -lpthread"
+        rlAssertExists "${TESTPROG}"
+        ./${TESTPROG} > log
+        RC=$?
 
+        rlAssert0 "Testing for success of the testcases" $RC
+        rlAssertNotEquals "Testing for segfault (bug 464146)" $RC 139
+        rlAssertEquals "Testing for correct output - output should contain 1 line" `cat log | wc -l` 1
+        rlAssertGrep "received \"Hello World\!\"" log
+    rlPhaseEnd
 
+    rlPhaseStartCleanup
+        rlRun "popd"
+        rlRun "rm -r $TESTTMPDIR"
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/Regression/bz464146-sp-corruption/testit.c b/tests/Regression/bz464146-sp-corruption/testit.c
index 54bf74b..ad58ed9 100644
--- a/tests/Regression/bz464146-sp-corruption/testit.c
+++ b/tests/Regression/bz464146-sp-corruption/testit.c
@@ -6,6 +6,7 @@
 #include <netdb.h>  
 #include <sys/mman.h>
 #include <limits.h>
+#include <unistd.h>
 
 
 /*
@@ -26,7 +27,7 @@ int port;
 void *receiver(void *);
 void *sender(void *);
 
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char *argv[];
 {