diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /unittest/examples | |
parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
parent | cb248f880619431850e5638009a6098048050edf (diff) | |
download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'unittest/examples')
-rw-r--r-- | unittest/examples/CMakeLists.txt | 2 | ||||
-rw-r--r-- | unittest/examples/core-t.c | 2 | ||||
-rw-r--r-- | unittest/examples/no_plan-t.c | 2 | ||||
-rw-r--r-- | unittest/examples/simple-t.c | 2 | ||||
-rw-r--r-- | unittest/examples/skip-t.c | 2 | ||||
-rw-r--r-- | unittest/examples/skip_all-t.c | 2 | ||||
-rw-r--r-- | unittest/examples/todo-t.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/unittest/examples/CMakeLists.txt b/unittest/examples/CMakeLists.txt index 86c4a5bea9e..cba7db5bd69 100644 --- a/unittest/examples/CMakeLists.txt +++ b/unittest/examples/CMakeLists.txt @@ -11,6 +11,6 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA MY_ADD_TESTS(simple skip todo skip_all no_plan) diff --git a/unittest/examples/core-t.c b/unittest/examples/core-t.c index 5f49e1cb1d9..12d9fe5c418 100644 --- a/unittest/examples/core-t.c +++ b/unittest/examples/core-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> diff --git a/unittest/examples/no_plan-t.c b/unittest/examples/no_plan-t.c index b795b2ca655..80a56970cf5 100644 --- a/unittest/examples/no_plan-t.c +++ b/unittest/examples/no_plan-t.c @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> diff --git a/unittest/examples/simple-t.c b/unittest/examples/simple-t.c index b3ead293289..ea64696c30c 100644 --- a/unittest/examples/simple-t.c +++ b/unittest/examples/simple-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <tap.h> diff --git a/unittest/examples/skip-t.c b/unittest/examples/skip-t.c index 4b1115e50f3..a8ca43f6e2c 100644 --- a/unittest/examples/skip-t.c +++ b/unittest/examples/skip-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <tap.h> #include <stdlib.h> diff --git a/unittest/examples/skip_all-t.c b/unittest/examples/skip_all-t.c index 9d31e0c3af8..cfe6432b267 100644 --- a/unittest/examples/skip_all-t.c +++ b/unittest/examples/skip_all-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> diff --git a/unittest/examples/todo-t.c b/unittest/examples/todo-t.c index e1be2e8eacd..91720b30f02 100644 --- a/unittest/examples/todo-t.c +++ b/unittest/examples/todo-t.c @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #include <my_global.h> |