Merge branch 'feature/upstream' into develop

1 files changed, 24 insertions, 19 deletions

diff --git a/tests/Makefile.gnulib b/tests/Makefile.gnulib
index 0dd3af6..0127385 100644
--- a/tests/Makefile.gnulib
+++ b/tests/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -521,11 +521,15 @@ EXTRA_DIST += test-localename.c macros.h
 
 ## begin gnulib module lock-tests
 
-TESTS += test-rwlock1 test-lock
-check_PROGRAMS += test-rwlock1 test-lock
+TESTS += test-rwlock1 test-lock test-once1 test-once2
+check_PROGRAMS += test-rwlock1 test-lock test-once1 test-once2
 test_rwlock1_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
 test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
-EXTRA_DIST += test-rwlock1.c test-lock.c
+test_once1_SOURCES = test-once.c
+test_once1_LDADD = $(LDADD) @LIBTHREAD@
+test_once2_SOURCES = test-once.c
+test_once2_LDADD = $(LDADD) @LIBMULTITHREAD@
+EXTRA_DIST += test-rwlock1.c test-lock.c test-once.c
 
 ## end   gnulib module lock-tests
 
@@ -722,8 +726,8 @@ signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
 	      -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \
-	      -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \
-	      -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \
+	      -e 's/@''GNULIB_PTHREAD_SIGMASK''@/$(GNULIB_PTHREAD_SIGMASK)/g' \
+	      -e 's/@''GNULIB_RAISE''@/$(GNULIB_RAISE)/g' \
 	      -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \
 	      -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \
 	      -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \
@@ -1100,9 +1104,10 @@ EXTRA_DIST += test-striconveh.c macros.h
 
 TESTS += test-striconveha
 check_PROGRAMS += test-striconveha
+test_striconveha_SOURCES = test-striconveha.c iconvsupport.c
 test_striconveha_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += test-striconveha.c macros.h
+EXTRA_DIST += test-striconveha.c iconvsupport.c macros.h
 
 ## end   gnulib module striconveha-tests
 
@@ -1651,10 +1656,10 @@ EXTRA_DIST += unicase/test-ulc-casecoll1.sh unicase/test-ulc-casecoll2.sh unicas
 
 TESTS += test-u16-conv-from-enc
 check_PROGRAMS += test-u16-conv-from-enc
-test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c
+test_u16_conv_from_enc_SOURCES = uniconv/test-u16-conv-from-enc.c iconvsupport.c
 test_u16_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u16-conv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u16-conv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u16-conv-from-enc-tests
 
@@ -1673,10 +1678,10 @@ EXTRA_DIST += uniconv/test-u16-conv-to-enc.c macros.h
 
 TESTS += test-u16-strconv-from-enc
 check_PROGRAMS += test-u16-strconv-from-enc
-test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c
+test_u16_strconv_from_enc_SOURCES = uniconv/test-u16-strconv-from-enc.c iconvsupport.c
 test_u16_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u16-strconv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u16-strconv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u16-strconv-from-enc-tests
 
@@ -1695,10 +1700,10 @@ EXTRA_DIST += uniconv/test-u16-strconv-to-enc.c macros.h
 
 TESTS += test-u32-conv-from-enc
 check_PROGRAMS += test-u32-conv-from-enc
-test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c
+test_u32_conv_from_enc_SOURCES = uniconv/test-u32-conv-from-enc.c iconvsupport.c
 test_u32_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u32-conv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u32-conv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u32-conv-from-enc-tests
 
@@ -1717,10 +1722,10 @@ EXTRA_DIST += uniconv/test-u32-conv-to-enc.c macros.h
 
 TESTS += test-u32-strconv-from-enc
 check_PROGRAMS += test-u32-strconv-from-enc
-test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c
+test_u32_strconv_from_enc_SOURCES = uniconv/test-u32-strconv-from-enc.c iconvsupport.c
 test_u32_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u32-strconv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u32-strconv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u32-strconv-from-enc-tests
 
@@ -1739,10 +1744,10 @@ EXTRA_DIST += uniconv/test-u32-strconv-to-enc.c macros.h
 
 TESTS += test-u8-conv-from-enc
 check_PROGRAMS += test-u8-conv-from-enc
-test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c
+test_u8_conv_from_enc_SOURCES = uniconv/test-u8-conv-from-enc.c iconvsupport.c
 test_u8_conv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u8-conv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u8-conv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u8-conv-from-enc-tests
 
@@ -1761,10 +1766,10 @@ EXTRA_DIST += uniconv/test-u8-conv-to-enc.c macros.h
 
 TESTS += test-u8-strconv-from-enc
 check_PROGRAMS += test-u8-strconv-from-enc
-test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c
+test_u8_strconv_from_enc_SOURCES = uniconv/test-u8-strconv-from-enc.c iconvsupport.c
 test_u8_strconv_from_enc_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 
-EXTRA_DIST += uniconv/test-u8-strconv-from-enc.c macros.h
+EXTRA_DIST += uniconv/test-u8-strconv-from-enc.c iconvsupport.c macros.h
 
 ## end   gnulib module uniconv/u8-strconv-from-enc-tests