Resolve merge conflict

pawn-lang · Mar 18, 2018 · 11b5ca1 · 11b5ca1
1 parent a8ca60b
commit 11b5ca1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/source/compiler/tests/CMakeLists.txt b/source/compiler/tests/CMakeLists.txt
@@ -46,6 +46,11 @@ set_tests_properties(meaningless_class_specifiers_gh_172 PROPERTIES PASS_REGULAR
 .*\\.pwn\\(2\\) : warning 238: meaningless combination of class specifiers \\(const variable arguments\\)\
 ")
 
+add_compiler_test(gh_283 ${CMAKE_CURRENT_SOURCE_DIR}/gh_283.pwn)
+set_tests_properties(gh_283 PROPERTIES PASS_REGULAR_EXPRESSION "\
+.*\\.pwn\\(5\\) : warning 234: function is deprecated \\(symbol \"print\"\\)\
+")
+
 # Crashers
 #
 # These tests simply check that the compiler doesn't crash.