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>

15 files changed, 4 insertions, 4 deletions

diff --git a/ubi-utils/tests/Makefile b/tests/ubi-tests/Makefile
index ca0069d..a2a49d0 100644
--- 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
index 06e71d3..06e71d3 100644
--- a/ubi-utils/tests/README.udev
+++ b/tests/ubi-tests/README.udev
diff --git a/ubi-utils/tests/common.c b/tests/ubi-tests/common.c
index cb63e77..cb63e77 100644
--- a/ubi-utils/tests/common.c
+++ b/tests/ubi-tests/common.c
diff --git a/ubi-utils/tests/common.h b/tests/ubi-tests/common.h
index 3e8ada8..3e8ada8 100644
--- a/ubi-utils/tests/common.h
+++ b/tests/ubi-tests/common.h
diff --git a/ubi-utils/tests/integ.c b/tests/ubi-tests/integ.c
index 4da7121..4da7121 100644
--- a/ubi-utils/tests/integ.c
+++ b/tests/ubi-tests/integ.c
diff --git a/ubi-utils/tests/io_basic.c b/tests/ubi-tests/io_basic.c
index 2e8809a..2e8809a 100644
--- a/ubi-utils/tests/io_basic.c
+++ b/tests/ubi-tests/io_basic.c
diff --git a/ubi-utils/tests/io_paral.c b/tests/ubi-tests/io_paral.c
index 488a0b0..488a0b0 100644
--- a/ubi-utils/tests/io_paral.c
+++ b/tests/ubi-tests/io_paral.c
diff --git a/ubi-utils/tests/io_read.c b/tests/ubi-tests/io_read.c
index c5d1da7..c5d1da7 100644
--- a/ubi-utils/tests/io_read.c
+++ b/tests/ubi-tests/io_read.c
diff --git a/ubi-utils/tests/io_update.c b/tests/ubi-tests/io_update.c
index 2e3422a..2e3422a 100644
--- a/ubi-utils/tests/io_update.c
+++ b/tests/ubi-tests/io_update.c
diff --git a/ubi-utils/tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
index 023b06b..023b06b 100644
--- a/ubi-utils/tests/mkvol_bad.c
+++ b/tests/ubi-tests/mkvol_bad.c
diff --git a/ubi-utils/tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
index e2120e9..e2120e9 100644
--- a/ubi-utils/tests/mkvol_basic.c
+++ b/tests/ubi-tests/mkvol_basic.c
diff --git a/ubi-utils/tests/mkvol_paral.c b/tests/ubi-tests/mkvol_paral.c
index faf085c..faf085c 100644
--- a/ubi-utils/tests/mkvol_paral.c
+++ b/tests/ubi-tests/mkvol_paral.c
diff --git a/ubi-utils/tests/rmvol.c b/tests/ubi-tests/rmvol.c
index fb9b344..fb9b344 100644
--- a/ubi-utils/tests/rmvol.c
+++ b/tests/ubi-tests/rmvol.c
diff --git a/ubi-utils/tests/rsvol.c b/tests/ubi-tests/rsvol.c
index 7a9e5ea..7a9e5ea 100644
--- a/ubi-utils/tests/rsvol.c
+++ b/tests/ubi-tests/rsvol.c
diff --git a/ubi-utils/tests/runtests.sh b/tests/ubi-tests/runtests.sh
index 7072e03..7072e03 100755
--- a/ubi-utils/tests/runtests.sh
+++ b/tests/ubi-tests/runtests.sh