From efa2084a840fb83fd9be83adca57e5f23d3fa9fe Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 10 Mar 2015 17:55:25 +0100 Subject: [PATCH] scripts: remove useless build tools test-framework.sh is an old script to check building of some dependencies. testhost is an old app used to check HOSTCC. Let's clean the scripts directory. Signed-off-by: Thomas Monjalon --- GNUmakefile | 2 +- doc/guides/linux_gsg/quick_start.rst | 4 +- scripts/Makefile | 36 -------- scripts/test-framework.sh | 131 --------------------------- scripts/testhost/Makefile | 48 ---------- scripts/testhost/testhost.c | 55 ----------- 6 files changed, 2 insertions(+), 274 deletions(-) delete mode 100644 scripts/Makefile delete mode 100755 scripts/test-framework.sh delete mode 100644 scripts/testhost/Makefile delete mode 100644 scripts/testhost/testhost.c diff --git a/GNUmakefile b/GNUmakefile index d44da4357b..d04c20b605 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,6 +40,6 @@ export RTE_SDK # directory list # -ROOTDIRS-y := scripts lib app +ROOTDIRS-y := lib app include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/doc/guides/linux_gsg/quick_start.rst b/doc/guides/linux_gsg/quick_start.rst index d4652df789..a1dd3ee4c9 100644 --- a/doc/guides/linux_gsg/quick_start.rst +++ b/doc/guides/linux_gsg/quick_start.rst @@ -211,9 +211,7 @@ The following selection demonstrates the creation of the x86_64-native-linuxapp- ================== Installing x86_64-native-linuxapp-gcc Configuration done - == Build scripts - == Build scripts/testhost - HOSTCC testhost.o + == Build lib ... Build complete RTE_TARGET exported as x86_64-native -linuxapp-gcc diff --git a/scripts/Makefile b/scripts/Makefile deleted file mode 100644 index 437a8011ad..0000000000 --- a/scripts/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -include $(RTE_SDK)/mk/rte.vars.mk - -DIRS-y += testhost - -include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/scripts/test-framework.sh b/scripts/test-framework.sh deleted file mode 100755 index 68614518f2..0000000000 --- a/scripts/test-framework.sh +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# script to check that dependancies are working in the framework -# must be executed from root - -# do a first build -make config T=x86_64-native-linuxapp-gcc O=deptest -make -j8 O=deptest - -MOD_APP_TEST1=`stat deptest/app/test | grep Modify` -MOD_APP_TEST_MEMPOOL1=`stat deptest/build/app/test/test_mempool.o | grep Modify` -MOD_LIB_MEMPOOL1=`stat deptest/lib/librte_mempool.a | grep Modify` -MOD_LIB_MBUF1=`stat deptest/lib/librte_mbuf.a | grep Modify` - -echo "----- touch mempool.c, and check that deps are updated" -sleep 1 -touch lib/librte_mempool/rte_mempool.c -make -j8 O=deptest - -MOD_APP_TEST2=`stat deptest/app/test | grep Modify` -MOD_APP_TEST_MEMPOOL2=`stat deptest/build/app/test/test_mempool.o | grep Modify` -MOD_LIB_MEMPOOL2=`stat deptest/lib/librte_mempool.a | grep Modify` -MOD_LIB_MBUF2=`stat deptest/lib/librte_mbuf.a | grep Modify` - -if [ "${MOD_APP_TEST1}" = "${MOD_APP_TEST2}" ]; then - echo ${MOD_APP_TEST1} / ${MOD_APP_TEST2} - echo "Bad deps on deptest/app/test" - exit 1 -fi -if [ "${MOD_APP_TEST_MEMPOOL1}" != "${MOD_APP_TEST_MEMPOOL2}" ]; then - echo "Bad deps on deptest/build/app/test/test_mempool.o" - exit 1 -fi -if [ "${MOD_LIB_MEMPOOL1}" = "${MOD_LIB_MEMPOOL2}" ]; then - echo "Bad deps on deptest/lib/librte_mempool.a" - exit 1 -fi -if [ "${MOD_LIB_MBUF1}" != "${MOD_LIB_MBUF2}" ]; then - echo "Bad deps on deptest/lib/librte_mbuf.a" - exit 1 -fi - -echo "----- touch mempool.h, and check that deps are updated" -sleep 1 -touch lib/librte_mempool/rte_mempool.h -make -j8 O=deptest - -MOD_APP_TEST3=`stat deptest/app/test | grep Modify` -MOD_APP_TEST_MEMPOOL3=`stat deptest/build/app/test/test_mempool.o | grep Modify` -MOD_LIB_MEMPOOL3=`stat deptest/lib/librte_mempool.a | grep Modify` -MOD_LIB_MBUF3=`stat deptest/lib/librte_mbuf.a | grep Modify` - -if [ "${MOD_APP_TEST2}" = "${MOD_APP_TEST3}" ]; then - echo "Bad deps on deptest/app/test" - exit 1 -fi -if [ "${MOD_APP_TEST_MEMPOOL2}" = "${MOD_APP_TEST_MEMPOOL3}" ]; then - echo "Bad deps on deptest/build/app/test/test_mempool.o" - exit 1 -fi -if [ "${MOD_LIB_MEMPOOL2}" = "${MOD_LIB_MEMPOOL3}" ]; then - echo "Bad deps on deptest/lib/librte_mempool.a" - exit 1 -fi -if [ "${MOD_LIB_MBUF2}" = "${MOD_LIB_MBUF3}" ]; then - echo "Bad deps on deptest/lib/librte_mbuf.a" - exit 1 -fi - - -echo "----- change mempool.c's CFLAGS, and check that deps are updated" -sleep 1 -make -j8 O=deptest CFLAGS_rte_mempool.o="-DDUMMY_TEST" - -MOD_APP_TEST4=`stat deptest/app/test | grep Modify` -MOD_APP_TEST_MEMPOOL4=`stat deptest/build/app/test/test_mempool.o | grep Modify` -MOD_LIB_MEMPOOL4=`stat deptest/lib/librte_mempool.a | grep Modify` -MOD_LIB_MBUF4=`stat deptest/lib/librte_mbuf.a | grep Modify` - -if [ "${MOD_APP_TEST3}" = "${MOD_APP_TEST4}" ]; then - echo "Bad deps on deptest/app/test" - exit 1 -fi -if [ "${MOD_APP_TEST_MEMPOOL3}" != "${MOD_APP_TEST_MEMPOOL4}" ]; then - echo "Bad deps on deptest/build/app/test/test_mempool.o" - exit 1 -fi -if [ "${MOD_LIB_MEMPOOL3}" = "${MOD_LIB_MEMPOOL4}" ]; then - echo "Bad deps on deptest/lib/librte_mempool.a" - exit 1 -fi -if [ "${MOD_LIB_MBUF3}" != "${MOD_LIB_MBUF4}" ]; then - echo "Bad deps on deptest/lib/librte_mbuf.a" - exit 1 -fi - - -echo "----- Deps check ok" -rm -rf deptest -exit 0 diff --git a/scripts/testhost/Makefile b/scripts/testhost/Makefile deleted file mode 100644 index fca55348b8..0000000000 --- a/scripts/testhost/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# BSD LICENSE -# -# Copyright(c) 2010-2014 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -include $(RTE_SDK)/mk/rte.vars.mk - -# -# library name -# -HOSTAPP = testhost - -HOST_CFLAGS += -I$(SRCDIR) - -# HOST_LDFLAGS += - -# -# all source are stored in SRCS-y -# -SRCS-y := testhost.c - -include $(RTE_SDK)/mk/rte.hostapp.mk diff --git a/scripts/testhost/testhost.c b/scripts/testhost/testhost.c deleted file mode 100644 index 00cd35f030..0000000000 --- a/scripts/testhost/testhost.c +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include - -struct toto { - int x; - int y; -}; - -int main(int argc, char **argv) -{ - struct toto t[] = { - { .x = 1, .y = 2 }, - { .x = 1, .y = 2 }, - { .x = 1, .y = 2 }, - { .x = 1, .y = 2 }, - }; - - struct toto u[4]; - - printf("%zu %zu\n", sizeof(t), sizeof(u)); - - return 0; -} -- 2.20.1