tests: fix test_annot_pkgconfig.nit so it actually works

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/tests/error_annot_pkgconfig.nit b/tests/error_annot_pkgconfig.nit
index c8ef400..58335e3 100644 (file)
--- a/tests/error_annot_pkgconfig.nit
+++ b/tests/error_annot_pkgconfig.nit
@@ -14,10 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#alt0# module error_annot_pkgconfig_alt0 is pkgconfig() # 0 arg
-#alt1# module error_annot_pkgconfig_alt1 is pkgconfig("missing-lib")
-#alt2# module error_annot_pkgconfig_alt2 is pkgconfig("too many args", 123)
-#alt3# module error_annot_pkgconfig_alt3 is pkgconfig(1234) # not a string
+#alt0# module error_annot_pkgconfig_alt0 is pkgconfig # defaults to module name
+#alt1# module error_annot_pkgconfig_alt1 is pkgconfig("missing-lib", "other missing lib")
+#alt2# module error_annot_pkgconfig_alt2 is pkgconfig(1234) # not a string
 
 fun foo `{ `}
 foo

diff --git a/tests/sav/error_annot_pkgconfig_alt0.res b/tests/sav/error_annot_pkgconfig_alt0.res
index 6d7dfcc..c8148e7 100644 (file)
--- a/tests/sav/error_annot_pkgconfig_alt0.res
+++ b/tests/sav/error_annot_pkgconfig_alt0.res
@@ -1 +1 @@
-alt/error_annot_pkgconfig_alt0.nit:17,48: Syntax Error: unexpected ')'.
+alt/error_annot_pkgconfig_alt0.nit:17,38--46: Error: dev package for `error_annot_pkgconfig_alt0` unknown by `pkg-config`, install it with `apt-get`, `brew` or similar.

diff --git a/tests/sav/error_annot_pkgconfig_alt1.res b/tests/sav/error_annot_pkgconfig_alt1.res
index 6f634f2..4fb9358 100644 (file)
--- a/tests/sav/error_annot_pkgconfig_alt1.res
+++ b/tests/sav/error_annot_pkgconfig_alt1.res
@@ -1 +1,2 @@
-alt/error_annot_pkgconfig_alt1.nit:18,38--61: Error: dev package for `missing-lib` unknown by `pkg-config`, install it with `apt-get`, `brew` or similar.
+alt/error_annot_pkgconfig_alt1.nit:18,38--82: Error: dev package for `missing-lib` unknown by `pkg-config`, install it with `apt-get`, `brew` or similar.
+alt/error_annot_pkgconfig_alt1.nit:18,38--82: Error: dev package for `other missing lib` unknown by `pkg-config`, install it with `apt-get`, `brew` or similar.

diff --git a/tests/sav/error_annot_pkgconfig_alt2.res b/tests/sav/error_annot_pkgconfig_alt2.res
index 1c4c22a..1a9aa4e 100644 (file)
--- a/tests/sav/error_annot_pkgconfig_alt2.res
+++ b/tests/sav/error_annot_pkgconfig_alt2.res
@@ -1 +1 @@
-alt/error_annot_pkgconfig_alt2.nit:19,38--68: Syntax Error: `pkgconfig` expects its arguments to be the name of the package as String literals.
+alt/error_annot_pkgconfig_alt2.nit:19,38--52: Syntax Error: `pkgconfig` expects its arguments to be the name of the package as String literals.

diff --git a/tests/sav/error_annot_pkgconfig_alt3.res b/tests/sav/error_annot_pkgconfig_alt3.res
deleted file mode 100644 (file)
index 62ad9d4..0000000
--- a/tests/sav/error_annot_pkgconfig_alt3.res
+++ /dev/null
@@ -1 +0,0 @@
-alt/error_annot_pkgconfig_alt3.nit:20,38--52: Syntax Error: `pkgconfig` expects its arguments to be the name of the package as String literals.

diff --git a/tests/sav/test_annot_pkgconfig_alt1.res b/tests/sav/test_annot_pkgconfig_alt1.res
deleted file mode 100644 (file)
index 033d032..0000000
--- a/tests/sav/test_annot_pkgconfig_alt1.res
+++ /dev/null
@@ -1 +0,0 @@
-alt/test_annot_pkgconfig_alt1.nit:17,8--27: Error: module name mismatch; declared test_annot_pkgconfig file named test_annot_pkgconfig_alt1.

diff --git a/tests/sav/test_annot_pkgconfig_alt2.res b/tests/sav/test_annot_pkgconfig_alt2.res
deleted file mode 100644 (file)
index a30526f..0000000
--- a/tests/sav/test_annot_pkgconfig_alt2.res
+++ /dev/null
@@ -1 +0,0 @@
-alt/test_annot_pkgconfig_alt2.nit:18,8--27: Error: module name mismatch; declared test_annot_pkgconfig file named test_annot_pkgconfig_alt2.

diff --git a/tests/test_annot_pkgconfig.nit b/tests/test_annot_pkgconfig.nit
index c312bdb..69a8bb1 100644 (file)
--- a/tests/test_annot_pkgconfig.nit
+++ b/tests/test_annot_pkgconfig.nit
@@ -14,5 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#alt1# module test_annot_pkgconfig is pkgconfig("sdl")
-#alt2# module test_annot_pkgconfig is pkgconfig("sdl", "egl")
+#alt1# module test_annot_pkgconfig_alt1 is pkgconfig("sdl")
+#alt2# module test_annot_pkgconfig_alt2 is pkgconfig("sdl", "egl")
+
+fun foo `{ `}
+foo