Skip to content

Commit

Permalink
ltp/pounder: do some cleanup work for pounder21 test suites
Browse files Browse the repository at this point in the history
ChangeLog:
	- Cleanup ltp buildscript in pounder
	- Remove two outdated patches from pounder21/src/

Signed-off-by: Li Wang <[email protected]>
Acked-by: Cyril Hrubis <[email protected]>
  • Loading branch information
wangli5665 authored and metan-ucw committed Aug 20, 2015
1 parent 3a23e1b commit 14b8c20
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 175 deletions.
41 changes: 0 additions & 41 deletions tools/pounder21/build_scripts/ltp
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,6 @@ source "$POUNDER_HOME/libpounder.sh"
# Go up two levels to the top ltp dir.
cd "$POUNDER_HOME/../../"

# Apply a patch if this is Debian/Ubuntu.
if [ -f /etc/debian_version ]; then
# Have we already patched this?
if [ ! -e "testcases/network/sctp/func_tests/test_1_to_1_connect.c.pounder" ]; then
cp -pRdu testcases/network/sctp/func_tests/test_1_to_1_connect.c testcases/network/sctp/func_tests/test_1_to_1_connect.c.pounder
echo "Debian/Ubuntu detected; applying build fixes..."
patch -p1 < $POUNDER_SRCDIR/ltp-debian-build.patch
RESULT=$?
if [ $RESULT -ne 0 ]; then
echo Patching failed.
exit 1
fi
fi
else
# We need to _unpatch_ this.
if [ -e "testcases/network/sctp/func_tests/test_1_to_1_connect.c.pounder" ]; then
rm -rf testcases/network/sctp/func_tests/test_1_to_1_connect.c.pounder
echo "Previous Debian/Ubuntu detected; removing build fixes..."
patch -p1 -R < $POUNDER_SRCDIR/ltp-debian-build.patch
RESULT=$?
if [ $RESULT -ne 0 ]; then
echo Patching failed.
exit 1
fi
fi

fi

# NAK the setregid EPERM -> EINVAL patch, because it's
# broken on 2.6! May be fixed some time after 20050804 release.
#if [ ! -e "testcases/kernel/syscalls/setregid/setregid02.c.pounder" ]; then
# echo "Patching some holes in ltp..."
# cp -pRdu testcases/kernel/syscalls/setregid/setregid02.c testcases/kernel/syscalls/setregid/setregid02.c.pounder
# patch -p1 < $POUNDER_SRCDIR/ltp-setregid-fix.patch
# RESULT=$?
# if [ $RESULT -ne 0 ]; then
# echo Patching failed.
# exit 1
# fi
#fi

# Build
./configure
make -j$NR_CPUS
Expand Down
120 changes: 0 additions & 120 deletions tools/pounder21/src/ltp-debian-build.patch

This file was deleted.

14 changes: 0 additions & 14 deletions tools/pounder21/src/ltp-setregid-fix.patch

This file was deleted.

0 comments on commit 14b8c20

Please sign in to comment.