aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-16 09:52:21 +0200
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>2012-11-16 09:52:21 +0200
commit98ed9f3360bb5cbfb02d2cb82ee3167fce437772 (patch)
tree1d174314cb22a079eb27575564b406b7be016102
parentc557e71b1070e3282156c0466462975a95d0d05c (diff)
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>
-rw-r--r--tests/ubi-tests/Makefile2
-rw-r--r--tests/ubi-tests/helpers.c (renamed from tests/ubi-tests/common.c)2
-rw-r--r--tests/ubi-tests/helpers.h (renamed from tests/ubi-tests/common.h)6
-rw-r--r--tests/ubi-tests/integ.c2
-rw-r--r--tests/ubi-tests/io_basic.c2
-rw-r--r--tests/ubi-tests/io_paral.c2
-rw-r--r--tests/ubi-tests/io_read.c2
-rw-r--r--tests/ubi-tests/io_update.c2
-rw-r--r--tests/ubi-tests/mkvol_bad.c2
-rw-r--r--tests/ubi-tests/mkvol_basic.c2
-rw-r--r--tests/ubi-tests/mkvol_paral.c2
-rw-r--r--tests/ubi-tests/rsvol.c2
-rw-r--r--tests/ubi-tests/volrefcnt.c2
13 files changed, 15 insertions, 15 deletions
diff --git a/tests/ubi-tests/Makefile b/tests/ubi-tests/Makefile
index 2c47a9f..ace0120 100644
--- 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
index a64ea75..dec9d23 100644
--- 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
index 88e963f..ae9d030 100644
--- 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 e48f533..7ef3cf2 100644
--- 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 566514c..8adb8e1 100644
--- 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 615c1dd..4764255 100644
--- 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 fb8018a..27d4d58 100644
--- 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 ec109e0..27ece52 100644
--- 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 e28df49..2292df6 100644
--- 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 3381ac4..1a02c47 100644
--- 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 8c6e02f..4a6ae46 100644
--- 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 917d6ba..50d6429 100644
--- 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 9b5a53c..1700ab7 100644
--- 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"