From patchwork Fri Oct 10 06:27:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 398468 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 70CE4140080 for ; Fri, 10 Oct 2014 17:36:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751462AbaJJGgE (ORCPT ); Fri, 10 Oct 2014 02:36:04 -0400 Received: from mail-la0-f47.google.com ([209.85.215.47]:54261 "EHLO mail-la0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbaJJGgD (ORCPT ); Fri, 10 Oct 2014 02:36:03 -0400 Received: by mail-la0-f47.google.com with SMTP id pv20so2627093lab.34 for ; Thu, 09 Oct 2014 23:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=M2JU49zNlx4y6iLO1OlZ8R4MWWUHjdlJEKdniaHnISc=; b=EyqqZqyyZKSIkTMHajW+O324dY8VLR2/mruzEz4r5r0/0vvSiw6xz8LRjHcmMUxYTQ Fhb0krT3k4BBK31u2CDE7rOe4P/I8L+wjfHkq9BcphXlkiUPml58k82wgJBTfTZOfjQf q8eDOjncE3ndoVFvdJ8HY9xLCxjn1IK7MaWwpodp0cnKp3idbQ/aZCsKYN8RhUQYW12S W4pAYqQwr1bsW91hdgPzDsk/qodnbGtnywx2QBJmT5T/Q4jWxBrvFKPbb5IQ3obomDQc qy9Zhi+XqU/p3KpTJAbQmBrkXd8BLA2qhwgy8OeulJqmH70GqtyL728V76BZSQcjmNiC kduw== X-Received: by 10.152.206.35 with SMTP id ll3mr1319093lac.88.1412922961074; Thu, 09 Oct 2014 23:36:01 -0700 (PDT) Received: from localhost.localdomain (77-123-172-44-ptr.volia-lviv.com. [77.123.172.44]) by mx.google.com with ESMTPSA id o4sm1544666lao.32.2014.10.09.23.36.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Oct 2014 23:36:00 -0700 (PDT) From: Vadim Kochan To: netdev@vger.kernel.org Cc: Vadim Kochan Subject: [PATCH iproute2] tests: Allow to run tests recursively Date: Fri, 10 Oct 2014 09:27:19 +0300 Message-Id: <1412922439-28953-1-git-send-email-vadim4j@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Such approach allows to run *.t scripts from any tests/ subdirectories. One point is that tests from tests/cls/*.t (which are needed by tests/cls-testbed.t but does not exist yet) will also be ran aside with tests/cls-testbed.t which is not good because in such case they will be ran twice, so renamed these tests path to tests/cls/*.c in tests/cls-testbed.t Signed-off-by: Vadim Kochan --- testsuite/Makefile | 11 ++++++++++- testsuite/tests/cls-testbed.t | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/testsuite/Makefile b/testsuite/Makefile index d1bf359..2ba9547 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -4,7 +4,11 @@ PREFIX := sudo -E RESULTS_DIR := results ## -- End Config -- -TESTS := $(patsubst tests/%,%,$(wildcard tests/*.t)) +rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2)) + +TESTS := $(patsubst tests/%,%,$(call rwildcard,tests/,*.t)) +TESTS_DIR := $(dir $(TESTS)) + IPVERS := $(filter-out iproute2/Makefile,$(wildcard iproute2/*)) ifneq (,$(wildcard /proc/config.gz)) @@ -34,6 +38,11 @@ distclean: clean $(TESTS): @mkdir -p $(RESULTS_DIR) + + @for d in $(TESTS_DIR); do \ + mkdir -p $(RESULTS_DIR)/$$d; \ + done + @for i in $(IPVERS); do \ o=`echo $$i | sed -e 's/iproute2\///'`; \ echo -n "Running $@ [$$o/`uname -r`]: "; \ diff --git a/testsuite/tests/cls-testbed.t b/testsuite/tests/cls-testbed.t index efae2a5..9fe86f5 100755 --- a/testsuite/tests/cls-testbed.t +++ b/testsuite/tests/cls-testbed.t @@ -8,7 +8,7 @@ QDISCS="cbq htb dsmark" for q in ${QDISCS}; do ts_log "Preparing classifier testbed with qdisc $q" - for c in tests/cls/*.t; do + for c in tests/cls/*.c; do case "$q" in cbq)