ubi-tests: rename common.[ch] to helpers.[ch]

... to avoid confusion when the local common.h shadows the top-level common.h.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/tests/ubi-tests/Makefile b/tests/ubi-tests/Makefile
index 2c47a9fc32ead7171205eae18fb57a991cd69e0b..ace01202b40872df7031dce5797828f64c1de2bc 100644 (file)
--- a/tests/ubi-tests/Makefile
+++ b/tests/ubi-tests/Makefile
@@ -17,7 +17,7 @@ libubi.a: $(LIBUBI_PATH)/libubi.c  $(LIBUBI_HEADER_PATH)/libubi.h  $(LIBUBI_PATH
        $(CC) $(CFLAGS) -I $(LIBUBI_PATH) -I../../include -DUDEV_SETTLE_HACK -c $(LIBUBI_PATH)/libubi.c -o libubi.o
        ar cr libubi.a libubi.o
 
-$(TARGETS): $(addprefix $(BUILDDIR)/, common.o) libubi.a
+$(TARGETS): $(addprefix $(BUILDDIR)/, helpers.o) libubi.a
 
 clean::
        rm -f libubi.a

diff --git a/tests/ubi-tests/common.c b/tests/ubi-tests/helpers.c
similarity index 99%
rename from tests/ubi-tests/common.c
rename to tests/ubi-tests/helpers.c
index a64ea752783a1966c69793e8ab1358406db7e4f8..dec9d2317a5a72408e9eb1064e1985226204cc61 100644 (file)
--- a/tests/ubi-tests/common.c
+++ b/tests/ubi-tests/helpers.c
@@ -32,7 +32,7 @@
 #include <sys/time.h>
 #include <fcntl.h>
 #include "libubi.h"
-#include "common.h"
+#include "helpers.h"
 
 /**
  * __initial_check - check that common prerequisites which are required to run

diff --git a/tests/ubi-tests/common.h b/tests/ubi-tests/helpers.h
similarity index 98%
rename from tests/ubi-tests/common.h
rename to tests/ubi-tests/helpers.h
index 88e963fe1f776250d9b13482044b91d6b8a436c0..ae9d0308f96b6d79b0b8480af978a6fbc4c91a32 100644 (file)
--- a/tests/ubi-tests/common.h
+++ b/tests/ubi-tests/helpers.h
@@ -20,8 +20,8 @@
  * The stuff which is common for many tests.
  */
 
-#ifndef __COMMON_H__
-#define __COMMON_H__
+#ifndef __HELPERS_H__
+#define __HELPERS_H__
 
 #include <string.h>
 #include <stdio.h>
@@ -110,4 +110,4 @@ extern int __update_vol_patt(libubi_t libubi, const char *test, const char *func
 }
 #endif
 
-#endif /* !__COMMON_H__ */
+#endif /* !__HELPERS_H__ */

diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c
index e48f53372f35bfc60080a7fe4f81eae5c3140138..7ef3cf2e613466980d251bb4e52139a2b068aa98 100644 (file)
--- a/tests/ubi-tests/integ.c
+++ b/tests/ubi-tests/integ.c
@@ -14,7 +14,7 @@
 #include <sys/stat.h>
 
 #include "libubi.h"
-#include "common.h"
+#include "helpers.h"
 
 struct erase_block_info;
 struct volume_info;

diff --git a/tests/ubi-tests/io_basic.c b/tests/ubi-tests/io_basic.c
index 566514cabbbf63acbb6297a6f26cd4f38a923b2f..8adb8e18887b2d4b5520d9a1139f8b2cbbc64868 100644 (file)
--- a/tests/ubi-tests/io_basic.c
+++ b/tests/ubi-tests/io_basic.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include "libubi.h"
 #define TESTNAME "io_basic"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/io_paral.c b/tests/ubi-tests/io_paral.c
index 615c1dd0a292f84ad039a5d79605d1d7ce740bd1..4764255ec3d94bf3f300589f1e0ec9f3e6c06f00 100644 (file)
--- a/tests/ubi-tests/io_paral.c
+++ b/tests/ubi-tests/io_paral.c
@@ -32,7 +32,7 @@
 #include <fcntl.h>
 #include "libubi.h"
 #define TESTNAME "io_paral"
-#include "common.h"
+#include "helpers.h"
 
 #define THREADS_NUM 4
 #define ITERATIONS  (1024 * 1)

diff --git a/tests/ubi-tests/io_read.c b/tests/ubi-tests/io_read.c
index fb8018a90664c6156638db8f3d228e73fa508a45..27d4d5842ee056ee18efb48344876e13fa2e3f23 100644 (file)
--- a/tests/ubi-tests/io_read.c
+++ b/tests/ubi-tests/io_read.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include "libubi.h"
 #define TESTNAME "io_basic"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/io_update.c b/tests/ubi-tests/io_update.c
index ec109e0d514dcdae1b4162155e1b958dba66b647..27ece520dd73ade77cb75266415010cfa41b4827 100644 (file)
--- a/tests/ubi-tests/io_update.c
+++ b/tests/ubi-tests/io_update.c
@@ -32,7 +32,7 @@
 #include <libubi.h>
 #include <mtd/ubi-user.h>
 #define TESTNAME "io_update"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
index e28df49a786c41abc1203abe55994424907411f7..2292df6f8095bf3eba6da3c3d28556b9e7742f77 100644 (file)
--- a/tests/ubi-tests/mkvol_bad.c
+++ b/tests/ubi-tests/mkvol_bad.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include "libubi.h"
 #define TESTNAME "mkvol_bad"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
index 3381ac43e350876e61bc00992827693602a29657..1a02c4708fe1fb20dd48d4ec7525216b7b27347e 100644 (file)
--- a/tests/ubi-tests/mkvol_basic.c
+++ b/tests/ubi-tests/mkvol_basic.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include "libubi.h"
 #define TESTNAME "mkvol_basic"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/mkvol_paral.c b/tests/ubi-tests/mkvol_paral.c
index 8c6e02fc0bea8453f0ce2471841bf1e23691af40..4a6ae465357af1e554f910c281368888eafd0d79 100644 (file)
--- a/tests/ubi-tests/mkvol_paral.c
+++ b/tests/ubi-tests/mkvol_paral.c
@@ -26,7 +26,7 @@
 #include <pthread.h>
 #include "libubi.h"
 #define TESTNAME "mkvol_paral"
-#include "common.h"
+#include "helpers.h"
 
 #define THREADS_NUM 4
 #define ITERATIONS  500

diff --git a/tests/ubi-tests/rsvol.c b/tests/ubi-tests/rsvol.c
index 917d6bab085ca122f3b1edb02683972a9ce6a2ea..50d642952aa2e41c2c6485df3c1854052c8eec54 100644 (file)
--- a/tests/ubi-tests/rsvol.c
+++ b/tests/ubi-tests/rsvol.c
@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include "libubi.h"
 #define TESTNAME "rsvol"
-#include "common.h"
+#include "helpers.h"
 
 static libubi_t libubi;
 static struct ubi_dev_info dev_info;

diff --git a/tests/ubi-tests/volrefcnt.c b/tests/ubi-tests/volrefcnt.c
index 9b5a53ce517ec633c235bf732a9e1d63b87fc743..1700ab7a4a83f0d0ae4c61cf255ac72c8f7d95a4 100644 (file)
--- a/tests/ubi-tests/volrefcnt.c
+++ b/tests/ubi-tests/volrefcnt.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include "libubi.h"
 #define TESTNAME "rmvol"
-#include "common.h"
+#include "helpers.h"
 
 #define SYSFS_FILE "/sys/class/ubi/ubi%d_%d/usable_eb_size"