ubi-utils: move UBI tests to tests/ubi-tests/

Clean-up ubi-utils a little by moving tests to a proper place.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/tests/Makefile b/tests/ubi-tests/Makefile
similarity index 81%
rename from ubi-utils/tests/Makefile
rename to tests/ubi-tests/Makefile
index ca0069d916d3f69002d1d299d40d9048b4c1f25f..a2a49d0e46a33fb919968ec1ba912189909e2f5d 100644 (file)
--- a/ubi-utils/tests/Makefile
+++ b/tests/ubi-tests/Makefile
@@ -1,5 +1,5 @@
-
-INCLUDE1=../inc
+UBIUTILS=../../ubi-utils
+INCLUDE1=$(UBIUTILS)/inc
 INCLUDE2=../../include
 LIB=.
 
@@ -12,8 +12,8 @@ CFLAGS += -Wall -I$(INCLUDE1) -I$(INCLUDE2) -L$(LIB) -ggdb
 
 all: $(ALL_FILES)
 
-libubi: ../src/libubi.c  ../inc/libubi.h  ../src/libubi_int.h
-       $(CC) $(CFLAGS) -DUDEV_SETTLE_HACK -c ../src/libubi.c -o libubi.o
+libubi: $(UBIUTILS)/src/libubi.c  $(UBIUTILS)/inc/libubi.h  $(UBIUTILS)/src/libubi_int.h
+       $(CC) $(CFLAGS) -DUDEV_SETTLE_HACK -c $(UBIUTILS)/src/libubi.c -o libubi.o
        ar cr libubi.a libubi.o
 
 io_paral: io_paral.c common.c

diff --git a/ubi-utils/tests/README.udev b/tests/ubi-tests/README.udev
similarity index 100%
rename from ubi-utils/tests/README.udev
rename to tests/ubi-tests/README.udev

diff --git a/ubi-utils/tests/common.c b/tests/ubi-tests/common.c
similarity index 100%
rename from ubi-utils/tests/common.c
rename to tests/ubi-tests/common.c

diff --git a/ubi-utils/tests/common.h b/tests/ubi-tests/common.h
similarity index 100%
rename from ubi-utils/tests/common.h
rename to tests/ubi-tests/common.h

diff --git a/ubi-utils/tests/integ.c b/tests/ubi-tests/integ.c
similarity index 100%
rename from ubi-utils/tests/integ.c
rename to tests/ubi-tests/integ.c

diff --git a/ubi-utils/tests/io_basic.c b/tests/ubi-tests/io_basic.c
similarity index 100%
rename from ubi-utils/tests/io_basic.c
rename to tests/ubi-tests/io_basic.c

diff --git a/ubi-utils/tests/io_paral.c b/tests/ubi-tests/io_paral.c
similarity index 100%
rename from ubi-utils/tests/io_paral.c
rename to tests/ubi-tests/io_paral.c

diff --git a/ubi-utils/tests/io_read.c b/tests/ubi-tests/io_read.c
similarity index 100%
rename from ubi-utils/tests/io_read.c
rename to tests/ubi-tests/io_read.c

diff --git a/ubi-utils/tests/io_update.c b/tests/ubi-tests/io_update.c
similarity index 100%
rename from ubi-utils/tests/io_update.c
rename to tests/ubi-tests/io_update.c

diff --git a/ubi-utils/tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
similarity index 100%
rename from ubi-utils/tests/mkvol_bad.c
rename to tests/ubi-tests/mkvol_bad.c

diff --git a/ubi-utils/tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
similarity index 100%
rename from ubi-utils/tests/mkvol_basic.c
rename to tests/ubi-tests/mkvol_basic.c

diff --git a/ubi-utils/tests/mkvol_paral.c b/tests/ubi-tests/mkvol_paral.c
similarity index 100%
rename from ubi-utils/tests/mkvol_paral.c
rename to tests/ubi-tests/mkvol_paral.c

diff --git a/ubi-utils/tests/rmvol.c b/tests/ubi-tests/rmvol.c
similarity index 100%
rename from ubi-utils/tests/rmvol.c
rename to tests/ubi-tests/rmvol.c

diff --git a/ubi-utils/tests/rsvol.c b/tests/ubi-tests/rsvol.c
similarity index 100%
rename from ubi-utils/tests/rsvol.c
rename to tests/ubi-tests/rsvol.c

diff --git a/ubi-utils/tests/runtests.sh b/tests/ubi-tests/runtests.sh
similarity index 100%
rename from ubi-utils/tests/runtests.sh
rename to tests/ubi-tests/runtests.sh