ubi-tests: make tests compile again

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

diff --git a/tests/ubi-tests/Makefile b/tests/ubi-tests/Makefile
index 0ce99d8ee77b98d568c3db721db959dcd77f8d8c..d6be0dce6031543deedda5985b8f1978a2798d00 100644 (file)
--- a/tests/ubi-tests/Makefile
+++ b/tests/ubi-tests/Makefile
@@ -1,9 +1,9 @@
-LIBUBI_PATH=../../ubi-utils/new-utils/
-LIBUBI_SRC_PATH=../../ubi-utils/new-utils/src/
-LIBUBI_HEADER_PATH=../../ubi-utils/new-utils/include
-UBIUTILS_PATH=../../ubi-utils/new-utils/
+LIBUBI_PATH=../../ubi-utils/
+LIBUBI_SRC_PATH=../../ubi-utils/src/
+LIBUBI_HEADER_PATH=../../ubi-utils/include
+UBIUTILS_PATH=../../ubi-utils/
 
-LIBUBI_PATH=../../ubi-utils/new-utils/
+LIBUBI_PATH=../../ubi-utils/
 KERNELHDR := ../../include
 
 LIBS = libubi

diff --git a/tests/ubi-tests/common.c b/tests/ubi-tests/common.c
index 59b30a76c878bad3b99a0130bf98e0cbb2cd8a50..2381e675bbfe4fdfbe40cd5f418d1c6c56976304 100644 (file)
--- a/tests/ubi-tests/common.c
+++ b/tests/ubi-tests/common.c
@@ -57,7 +57,7 @@ int __initial_check(const char *test, int argc, char * const argv[])
                return -1;
        }
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                __failed(test, __FUNCTION__, __LINE__, "libubi_open");
                return -1;

diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c
index 9958466e3d992f716bce62c2e8ae37ee8a9bd218..bb60bcc52fbdbb95b23d5009cdb1a9f9ba9ccc8f 100644 (file)
--- a/tests/ubi-tests/integ.c
+++ b/tests/ubi-tests/integ.c
@@ -745,7 +745,7 @@ int main(int argc,char *argv[])
        srand(initial_seed);
        load_ubi();
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (!libubi)
                error_exit("Failed to open libubi");
 
@@ -766,7 +766,7 @@ int main(int argc,char *argv[])
 
                reload_ubi();
 
-               libubi = libubi_open(1);
+               libubi = libubi_open();
                if (!libubi)
                        error_exit("Failed to open libubi");
 

diff --git a/tests/ubi-tests/io_basic.c b/tests/ubi-tests/io_basic.c
index 819893c70f088bdce75083ccc8ca1d2bff5d79ce..566514cabbbf63acbb6297a6f26cd4f38a923b2f 100644 (file)
--- a/tests/ubi-tests/io_basic.c
+++ b/tests/ubi-tests/io_basic.c
@@ -150,7 +150,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/io_paral.c b/tests/ubi-tests/io_paral.c
index ed0cbe061c44820b543de733fb2fd86133d5e8cf..9d4244340f08c40a06807d7239339d6cc169c9de 100644 (file)
--- a/tests/ubi-tests/io_paral.c
+++ b/tests/ubi-tests/io_paral.c
@@ -173,7 +173,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/io_read.c b/tests/ubi-tests/io_read.c
index 30d6478b21b2513e8318390cdabe93dd830e060c..57a8da7dafccdcc73031c8f91eb824af7eda0a7f 100644 (file)
--- a/tests/ubi-tests/io_read.c
+++ b/tests/ubi-tests/io_read.c
@@ -361,7 +361,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/io_update.c b/tests/ubi-tests/io_update.c
index 24c056346e73ee583c9a6196d38a945dfc977267..dce4ee2e879c95b9714ec9b4607fda737fcf9ab9 100644 (file)
--- a/tests/ubi-tests/io_update.c
+++ b/tests/ubi-tests/io_update.c
@@ -272,7 +272,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
index 4ba4a72a9aa1494d5c1fe64da7c829a32855dda5..2e3c450bcc9eda0f9c3481a11be24d51aaf5a0d7 100644 (file)
--- a/tests/ubi-tests/mkvol_bad.c
+++ b/tests/ubi-tests/mkvol_bad.c
@@ -275,7 +275,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
index b2413bc15ebce67a4af8aad20bf32262a4818825..880c14942975f498e04671e8cedd21291d9abe0b 100644 (file)
--- a/tests/ubi-tests/mkvol_basic.c
+++ b/tests/ubi-tests/mkvol_basic.c
@@ -220,7 +220,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/mkvol_paral.c b/tests/ubi-tests/mkvol_paral.c
index adaa789edefba8c282d9ad41900c4966fbb02b5f..74be5fa04608636f71f267e65fdd9d4c2a6f13f2 100644 (file)
--- a/tests/ubi-tests/mkvol_paral.c
+++ b/tests/ubi-tests/mkvol_paral.c
@@ -79,7 +79,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/rsvol.c b/tests/ubi-tests/rsvol.c
index df920151a84d60946b2d3816466e4f9bc7af915d..8ec93bcb39012bdbb22e87f63bbec31a1ea6f069 100644 (file)
--- a/tests/ubi-tests/rsvol.c
+++ b/tests/ubi-tests/rsvol.c
@@ -276,7 +276,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;

diff --git a/tests/ubi-tests/volrefcnt.c b/tests/ubi-tests/volrefcnt.c
index 8618b2ea1f8e3243999d5dfabc8a2521eeae1a4d..a56deae9671f501b8f370fe7d68595d98199e7b9 100644 (file)
--- a/tests/ubi-tests/volrefcnt.c
+++ b/tests/ubi-tests/volrefcnt.c
@@ -49,7 +49,7 @@ int main(int argc, char * const argv[])
 
        node = argv[1];
 
-       libubi = libubi_open(1);
+       libubi = libubi_open();
        if (libubi == NULL) {
                failed("libubi_open");
                return 1;