From fd98ff924d71061a062b813cb784f83e4c89401f Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Sat, 15 Dec 2007 19:06:25 +0200 Subject: ubi-utils: clean-up UBI tests Signed-off-by: Artem Bityutskiy --- ubi-utils/tests/Makefile | 4 ++-- ubi-utils/tests/README.udev | 2 +- ubi-utils/tests/runtests.pl | 30 ------------------------------ 3 files changed, 3 insertions(+), 33 deletions(-) delete mode 100755 ubi-utils/tests/runtests.pl diff --git a/ubi-utils/tests/Makefile b/ubi-utils/tests/Makefile index 1b17f81..e296967 100644 --- a/ubi-utils/tests/Makefile +++ b/ubi-utils/tests/Makefile @@ -5,7 +5,7 @@ LIB=. CC := $(CROSS)gcc -ALL_FILES=libubi.a io_update +ALL_FILES=libubi io_update ALL_FILES+=io_paral io_read io_basic mkvol_basic mkvol_bad mkvol_paral rsvol ALL_FILES+=integ @@ -13,7 +13,7 @@ CFLAGS += -Wall -I$(INCLUDE1) -I$(INCLUDE2) -L$(LIB) -ggdb all: $(ALL_FILES) -libubi.a: ../src/libubi.c ../inc/libubi.h ../src/libubi_int.h +libubi: ../src/libubi.c ../inc/libubi.h ../src/libubi_int.h $(CC) $(CFLAGS) -c ../src/libubi.c -o libubi.o ar cr libubi.a libubi.o diff --git a/ubi-utils/tests/README.udev b/ubi-utils/tests/README.udev index a4ff9c5..6c12277 100644 --- a/ubi-utils/tests/README.udev +++ b/ubi-utils/tests/README.udev @@ -4,7 +4,7 @@ tests fail because of this. The symptom is error messages like "cannot open /dev/ubi0_0". One possible solution of this problem is to pre-create UBI device and volume -nodes. there is even a script which may be used for this in ubi-utils/scripts/. +nodes. There is even a script which may be used for this in ubi-utils/scripts/. But this is not enough because udev will still remove and re-create the nodes and tests will still fail. So you need to stop removing device nodes using the following udev rule: diff --git a/ubi-utils/tests/runtests.pl b/ubi-utils/tests/runtests.pl deleted file mode 100755 index 8005716..0000000 --- a/ubi-utils/tests/runtests.pl +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/perl -w - -sub usage; - -my @tests = ("mkvol_basic", "mkvol_bad", "mkvol_paral", "rsvol", - "io_basic", "io_read", "io_update", "io_paral"); - -if (not defined @ARGV) { - usage(); - exit; -} - -foreach (@ARGV) { - -c or die "Error: $_ is not character device\n"; -} - -my $dev; -foreach $dev (@ARGV) { - foreach (@tests) { - print "Running: $_ $dev"; - system "./$_ $dev" and die; - print "\tSUCCESS\n"; - } -} - -sub usage -{ - print "Usage:\n"; - print "$0 ...\n"; -} -- cgit v1.2.3