12 files changed, 21 insertions, 5 deletions
diff --git a/contrib/file/tests/Makefile.am b/contrib/file/tests/Makefile.am
index b44944346c0c..b17dfb12bb06 100644
--- a/contrib/file/tests/Makefile.am
+++ b/contrib/file/tests/Makefile.am
@@ -7,6 +7,8 @@ android-vdex-1.result \
 android-vdex-1.testfile \
 android-vdex-2.result \
 android-vdex-2.testfile \
+arj.result \
+arj.testfile \
 CVE-2014-1943.result \
 CVE-2014-1943.testfile \
 JW07022A.mp3.result \
@@ -35,6 +37,10 @@ json2.result \
 json2.testfile \
 json3.result \
 json3.testfile \
+json4.result \
+json4.testfile \
+json5.result \
+json5.testfile \
 matilde.arm.result \
 matilde.arm.testfile \
 pcjr.result \
diff --git a/contrib/file/tests/Makefile.in b/contrib/file/tests/Makefile.in
index 99264d83f5e4..7a41d2227cae 100644
--- a/contrib/file/tests/Makefile.in
+++ b/contrib/file/tests/Makefile.in
@@ -299,6 +299,8 @@ android-vdex-1.result \
 android-vdex-1.testfile \
 android-vdex-2.result \
 android-vdex-2.testfile \
+arj.result \
+arj.testfile \
 CVE-2014-1943.result \
 CVE-2014-1943.testfile \
 JW07022A.mp3.result \
@@ -327,6 +329,10 @@ json2.result \
 json2.testfile \
 json3.result \
 json3.testfile \
+json4.result \
+json4.testfile \
+json5.result \
+json5.testfile \
 matilde.arm.result \
 matilde.arm.testfile \
 pcjr.result \
diff --git a/contrib/file/tests/arj.result b/contrib/file/tests/arj.result
new file mode 100644
index 000000000000..8a32e67eb1c0
--- /dev/null
+++ b/contrib/file/tests/arj.result
@@ -0,0 +1 @@
+ARJ archive data, v11, slash-switched, created 5 1980+48, original name: example_m0.arj, os: Unix
+\ No newline at end of file
diff --git a/contrib/file/tests/arj.testfile b/contrib/file/tests/arj.testfile
new file mode 100644
index 000000000000..e133f8a28477
--- /dev/null
+++ b/contrib/file/tests/arj.testfile
diff --git a/contrib/file/tests/json1.result b/contrib/file/tests/json1.result
index 01442dc9c271..550d7ac2f9db 100644
--- a/contrib/file/tests/json1.result
+++ b/contrib/file/tests/json1.result
@@ -1 +1 @@
-JSON data
-\ No newline at end of file
+JSON text data
+\ No newline at end of file
diff --git a/contrib/file/tests/json2.result b/contrib/file/tests/json2.result
index 01442dc9c271..550d7ac2f9db 100644
--- a/contrib/file/tests/json2.result
+++ b/contrib/file/tests/json2.result
@@ -1 +1 @@
-JSON data
-\ No newline at end of file
+JSON text data
+\ No newline at end of file
diff --git a/contrib/file/tests/json3.result b/contrib/file/tests/json3.result
index 01442dc9c271..550d7ac2f9db 100644
--- a/contrib/file/tests/json3.result
+++ b/contrib/file/tests/json3.result
@@ -1 +1 @@
-JSON data
-\ No newline at end of file
+JSON text data
+\ No newline at end of file
diff --git a/contrib/file/tests/json4.result b/contrib/file/tests/json4.result
new file mode 100644
index 000000000000..550d7ac2f9db
--- /dev/null
+++ b/contrib/file/tests/json4.result
@@ -0,0 +1 @@
+JSON text data
+\ No newline at end of file
diff --git a/contrib/file/tests/json4.testfile b/contrib/file/tests/json4.testfile
new file mode 100644
index 000000000000..7660873d1031
--- /dev/null
+++ b/contrib/file/tests/json4.testfile
@@ -0,0 +1 @@
+[1]
diff --git a/contrib/file/tests/json5.result b/contrib/file/tests/json5.result
new file mode 100644
index 000000000000..90965495a30f
--- /dev/null
+++ b/contrib/file/tests/json5.result
@@ -0,0 +1 @@
+ASCII text
+\ No newline at end of file
diff --git a/contrib/file/tests/json5.testfile b/contrib/file/tests/json5.testfile
new file mode 100644
index 000000000000..01bd52f288fe
--- /dev/null
+++ b/contrib/file/tests/json5.testfile
@@ -0,0 +1 @@
+[1] 2
diff --git a/contrib/file/tests/test.c b/contrib/file/tests/test.c
index 468c9847209e..a3b91ba10d25 100644
--- a/contrib/file/tests/test.c
+++ b/contrib/file/tests/test.c
@@ -86,7 +86,7 @@ main(int argc, char **argv)
 	else
 		prog = argv[0];
 
-	ms = magic_open(MAGIC_NONE);
+	ms = magic_open(MAGIC_ERROR);
 	if (ms == NULL) {
 		(void)fprintf(stderr, "%s: ERROR opening MAGIC_NONE: %s\n",
 		    prog, strerror(errno));
@@ -105,7 +105,6 @@ main(int argc, char **argv)
 
 	if (argc != 3) {
 		(void)fprintf(stderr, "Usage: %s TEST-FILE RESULT\n", prog);
-		magic_close(ms);
 		goto bad;
 	}
 	if ((result = magic_file(ms, argv[1])) == NULL) {