From: Mark Stapp <mjs@voltanet.io>
Date: Thu, 12 Jul 2018 13:51:52 +0000 (-0400)
Subject: tests: align with srcdest lib changes, remove bgp binary
X-Git-Tag: frr-6.1-dev~172^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2861a0deda0452bdda01bfef34f9897b796217e5;p=matthieu%2Ffrr.git

tests: align with srcdest lib changes, remove bgp binary

Align the srcdest table test with recent api changes that use
'const' more strictly. Remove test_bgp_table binary - looks
as if it was committed by mistake.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
---

diff --git a/tests/bgpd/test_bgp_table b/tests/bgpd/test_bgp_table
deleted file mode 100755
index 05a7e8947b..0000000000
--- a/tests/bgpd/test_bgp_table
+++ /dev/null
@@ -1,228 +0,0 @@
-#! /bin/sh
-
-# bgpd/test_bgp_table - temporary wrapper script for .libs/test_bgp_table
-# Generated by libtool (GNU libtool) 2.4.6.40-6ca5-dirty
-#
-# The bgpd/test_bgp_table program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/marcel/src/haw/frr-1/tests; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=/home/marcel/.cargo/bin:/home/marcel/dotfiles/bin:/home/marcel/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl; export PATH; gcc -std=gnu11 -g3 -O0 -fno-omit-frame-pointer -funwind-tables -Wall -Wextra -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wbad-function-cast -Wwrite-strings -Wno-unused-result -Wno-unused-parameter -Wno-missing-field-initializers -pthread -rdynamic -o \$progdir/\$file bgpd/test_bgp_table.o  ../bgpd/libbgp.a ../bgpd/rfp-example/librfp/librfp.a ../lib/.libs/libfrr.so -lcap -ldl -lm -lcrypt -ljson-c -lrt -pthread -Wl,-rpath -Wl,/home/marcel/src/haw/frr-1/lib/.libs -Wl,-rpath -Wl,/usr/local/lib)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='2.4.6.40-6ca5-dirty'
-  notinst_deplibs=' ../lib/libfrr.la'
-else
-  # When we are sourced in execute mode, $file and $ECHO are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    file="$0"
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-    ECHO="printf %s\\n"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ that is used only on
-# windows platforms, and (c) all begin with the string --lt-
-# (application programs are unlikely to have options that match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's ../libtool value, followed by no.
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=$0
-  shift
-  for lt_opt
-  do
-    case "$lt_opt" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=`$ECHO "X$lt_script_arg0" | sed -e 's/^X//' -e 's%/[^/]*$%%'`
-        test "X$lt_dump_D" = "X$lt_script_arg0" && lt_dump_D=.
-        lt_dump_F=`$ECHO "X$lt_script_arg0" | sed -e 's/^X//' -e 's%^.*/%%'`
-        cat "$lt_dump_D/$lt_dump_F"
-        exit 0
-      ;;
-    --lt-*)
-        $ECHO "Unrecognized --lt- option: '$lt_opt'" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n "$lt_option_debug"; then
-    echo "test_bgp_table:bgpd/test_bgp_table:$LINENO: libtool wrapper (GNU libtool) 2.4.6.40-6ca5-dirty" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    $ECHO "test_bgp_table:bgpd/test_bgp_table:$LINENO: newargv[$lt_dump_args_N]: $lt_arg"
-    lt_dump_args_N=`expr $lt_dump_args_N + 1`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-
-      if test -n "$lt_option_debug"; then
-        $ECHO "test_bgp_table:bgpd/test_bgp_table:$LINENO: newargv[0]: $progdir/$program" 1>&2
-        func_lt_dump_args ${1+"$@"} 1>&2
-      fi
-      exec "$progdir/$program" ${1+"$@"}
-
-      $ECHO "$0: cannot exec $program $*" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from $@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case " $* " in
-  *\ --lt-*)
-    for lt_wr_arg
-    do
-      case $lt_wr_arg in
-      --lt-*) ;;
-      *) set x "$@" "$lt_wr_arg"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core ${1+"$@"}
-}
-
-  # Parse options
-  func_parse_lt_options "$0" ${1+"$@"}
-
-  # Find the directory that this script lives in.
-  thisdir=`$ECHO "$file" | sed 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$ECHO "$file" | sed 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$ECHO "$file" | sed 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | sed -n 's/.*-> //p'`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=no
-  if test "$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR" = "yes"; then
-    # special case for '.'
-    if test "$thisdir" = "."; then
-      thisdir=`pwd`
-    fi
-    # remove .libs from thisdir
-    case "$thisdir" in
-    *[\\/].libs ) thisdir=`$ECHO "$thisdir" | sed 's%[\\/][^\\/]*$%%'` ;;
-    .libs )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'test_bgp_table'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" ||
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-	$ECHO "$relink_command_output" >&2
-	rm -f "$progdir/$file"
-	exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-      func_exec_program ${1+"$@"}
-    fi
-  else
-    # The program doesn't exist.
-    $ECHO "$0: error: '$progdir/$program' does not exist" 1>&2
-    $ECHO "This script is just a wrapper for $program." 1>&2
-    $ECHO "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/tests/lib/test_srcdest_table.c b/tests/lib/test_srcdest_table.c
index 04e85435d1..53180564bd 100644
--- a/tests/lib/test_srcdest_table.c
+++ b/tests/lib/test_srcdest_table.c
@@ -228,7 +228,8 @@ static void test_dump(struct test_state *test)
 }
 
 static void test_failed(struct test_state *test, const char *message,
-			struct prefix_ipv6 *dst_p, struct prefix_ipv6 *src_p)
+			const struct prefix_ipv6 *dst_p,
+			const struct prefix_ipv6 *src_p)
 {
 	char *route_id = format_srcdest(dst_p, src_p);
 
@@ -250,7 +251,7 @@ static void test_state_verify(struct test_state *test)
 	/* Verify that there are no elements in the table which have never
 	 * been added */
 	for (rn = route_top(test->table); rn; rn = srcdest_route_next(rn)) {
-		struct prefix_ipv6 *dst_p, *src_p;
+		const struct prefix_ipv6 *dst_p, *src_p;
 
 		/* While we are iterating, we hold a lock on the current
 		 * route_node,
@@ -288,10 +289,10 @@ static void test_state_verify(struct test_state *test)
 				expected_lock++;
 
 			if (rn->lock != expected_lock) {
-				struct prefix_ipv6 *dst_p, *src_p;
+				const struct prefix_ipv6 *dst_p, *src_p;
 				srcdest_rnode_prefixes(
-					rn, (struct prefix **)&dst_p,
-					(struct prefix **)&src_p);
+					rn, (const struct prefix **)&dst_p,
+					(const struct prefix **)&src_p);
 
 				test_failed(
 					test,
@@ -305,8 +306,8 @@ static void test_state_verify(struct test_state *test)
 
 		assert(rn->info == (void *)0xdeadbeef);
 
-		srcdest_rnode_prefixes(rn, (struct prefix **)&dst_p,
-				       (struct prefix **)&src_p);
+		srcdest_rnode_prefixes(rn, (const struct prefix **)&dst_p,
+				       (const struct prefix **)&src_p);
 		memcpy(&hash_entry[0], dst_p, sizeof(*dst_p));
 		if (src_p)
 			memcpy(&hash_entry[1], src_p, sizeof(*src_p));
@@ -377,7 +378,7 @@ static void test_state_del_one_route(struct test_state *test, struct prng *prng)
 	which_route = prng_rand(prng) % test->log->count;
 
 	struct route_node *rn;
-	struct prefix *dst_p, *src_p;
+	const struct prefix *dst_p, *src_p;
 	struct prefix_ipv6 dst6_p, src6_p;
 
 	for (rn = route_top(test->table); rn; rn = srcdest_route_next(rn)) {