[taler-sync] branch master updated: move libsynctesting into separate directory

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository sync.

The following commit(s) were added to refs/heads/master by this push:
     new ba1e7c3  move libsynctesting into separate directory
ba1e7c3 is described below

commit ba1e7c3f889a17d0a9a584550f5cc52978ff9703
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Jul 18 17:59:12 2020 +0200

    move libsynctesting into separate directory
---
 .gitignore                                         |  20 +------
 configure.ac                                       |   3 +-
 src/Makefile.am                                    |   3 +-
 src/lib/Makefile.am                                |  61 +--------------------
 src/testing/.gitignore                             |   3 +
 src/{lib => testing}/Makefile.am                   |  29 +---------
 src/{lib => testing}/test_sync_api.c               |   0
 src/{lib => testing}/test_sync_api.conf            |   0
 .../.config/taler/exchange/account-2.json          |   0
 .../.config/taler/merchant/account-3.json          |   0
 .../.config/taler/merchant/default.priv            |   0
 .../test_sync_api_home/.config/taler/test.json     |   0
 .../share/taler/auditor/offline-keys/auditor.priv  |   0
 .../share/taler/exchange/offline-keys/master.priv  |   0
 .../share/taler/exchange/wirefees/x-taler-bank.fee | Bin
 .../.local/share/taler/merchant/merchant.priv      |   0
 .../testing_api_cmd_backup_download.c              |   0
 .../testing_api_cmd_backup_upload.c                |   0
 src/{lib => testing}/testing_api_helpers.c         |   0
 .../testing_api_trait_account_priv.c               |   0
 .../testing_api_trait_account_pub.c                |   0
 src/{lib => testing}/testing_api_trait_hash.c      |   0
 22 files changed, 11 insertions(+), 108 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ea12cf..a59fa5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@
 Makefile
 Makefile.in
 aclocal.m4
-anastasis_config.h
-anastasis_config.h.in
-anastasis_config.h.in~
 autom4te.cache/
 compile
 config.guess
@@ -31,12 +28,6 @@ src/Makefile
 src/Makefile.in
 src/util/.deps/
 src/util/.libs/
-src/stasis/Makefile
-src/stasis/Makefile.in
-src/stasis/libanastasis_plugin_db_postgres.la
-src/stasis/plugin_anastasis_postgres.lo
-src/stasis/plugin_anastasis_postgres.o
-src/stasis/.deps/
 src/backend/Makefile
 src/backend/Makefile.in
 src/include/Makefile
@@ -59,18 +50,9 @@ src/lib/.libs
 *.o
 *.la
 src/util/.deps/
-src/backend/.deps/
-src/backend/.idea/
-src/backend/.libs/
-src/stasis/.libs/
-src/backend/anastasis-httpd
 doc/Makefile.in
 src/include/Makefile.in
-
-A
-A
-
 sync_config.h
 sync_config.h.in
 src/sync/sync-httpd
-src/lib/test_sync_api_home/.local/share/taler/auditors/
+src/testing/test_sync_api_home/.local/share/taler/auditors/
diff --git a/configure.ac b/configure.ac
index 94f01ed..987beab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -327,8 +327,9 @@ doc/Makefile
 src/Makefile
 src/include/Makefile
 src/lib/Makefile
+src/util/Makefile
 src/sync/Makefile
 src/syncdb/Makefile
-src/util/Makefile
+src/testing/Makefile
 ])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index cd274f1..b4b6e7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,4 @@
 # This Makefile is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include
-SUBDIRS = include util syncdb sync lib
+SUBDIRS = include util syncdb sync lib testing
+
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 86bb4cd..f4979b5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -7,8 +7,7 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libsync.la \
-  libsynctesting.la
+  libsync.la 
 
 libsync_la_LDFLAGS = \
   -version-info 0:0:0 \
@@ -26,61 +25,3 @@ libsync_la_LIBADD = \
   -ljansson \
   $(XLIB)
 
-libsynctesting_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libsynctesting_la_SOURCES = \
-  testing_api_cmd_backup_download.c \
-  testing_api_cmd_backup_upload.c \
-  testing_api_helpers.c \
-  testing_api_trait_account_pub.c \
-  testing_api_trait_account_priv.c \
-  testing_api_trait_hash.c
-libsynctesting_la_LIBADD = \
-  libsync.la \
-  -ltalerexchange \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -lgnunetutil \
-  -ljansson \
-  -ltalertesting \
-  $(XLIB)
-
-check_PROGRAMS = \
-  test_sync_api
-
-TESTS = \
-  $(check_PROGRAMS)
-
-EXTRA_DIST = \
-  test_sync_api.conf \
-  test_sync_api_home/.config/taler/exchange/account-2.json \
-  test_sync_api_home/.local/share/taler/exchange/offline-keys/master.priv
-
-test_sync_api_SOURCES = \
-  test_sync_api.c
-test_sync_api_LDADD = \
-  libsync.la \
-  libsynctesting.la \
-  -ltalertesting \
-  -ltalermerchanttesting \
-  -ltalerfakebank \
-  -ltalerbank \
-  -ltalerexchange \
-  -ltalermerchant \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetjson \
-  -lgnunetcurl \
-  -lgnunetutil \
-  -ljansson
-
-if HAVE_LIBCURL
-libsync_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libsync_la_LIBADD += -lgnurl
-endif
-endif
diff --git a/src/testing/.gitignore b/src/testing/.gitignore
new file mode 100644
index 0000000..b3ffea1
--- /dev/null
+++ b/src/testing/.gitignore
@@ -0,0 +1,3 @@
+test_sync_api
+auditor.in
+test_sync_api_home/.local/share/taler/exchange/live-keys/
diff --git a/src/lib/Makefile.am b/src/testing/Makefile.am
similarity index 72%
copy from src/lib/Makefile.am
copy to src/testing/Makefile.am
index 86bb4cd..06d01d8 100644
--- a/src/lib/Makefile.am
+++ b/src/testing/Makefile.am
@@ -7,25 +7,8 @@ if USE_COVERAGE
 endif
 
 lib_LTLIBRARIES = \
-  libsync.la \
   libsynctesting.la
 
-libsync_la_LDFLAGS = \
-  -version-info 0:0:0 \
-  -no-undefined
-libsync_la_SOURCES = \
-  sync_api_curl_defaults.c sync_api_curl_defaults.h \
-  sync_api_download.c \
-  sync_api_upload.c
-libsync_la_LIBADD = \
-  -lgnunetcurl \
-  -lgnunetjson \
-  -ltalerjson \
-  -ltalerutil \
-  -lgnunetutil \
-  -ljansson \
-  $(XLIB)
-
 libsynctesting_la_LDFLAGS = \
   -version-info 0:0:0 \
   -no-undefined
@@ -37,7 +20,7 @@ libsynctesting_la_SOURCES = \
   testing_api_trait_account_priv.c \
   testing_api_trait_hash.c
 libsynctesting_la_LIBADD = \
-  libsync.la \
+  $(top_builddir)/src/lib/libsync.la \
   -ltalerexchange \
   -ltalerjson \
   -ltalerutil \
@@ -62,7 +45,7 @@ EXTRA_DIST = \
 test_sync_api_SOURCES = \
   test_sync_api.c
 test_sync_api_LDADD = \
-  libsync.la \
+  $(top_builddir)/src/lib/libsync.la \
   libsynctesting.la \
   -ltalertesting \
   -ltalermerchanttesting \
@@ -76,11 +59,3 @@ test_sync_api_LDADD = \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
-
-if HAVE_LIBCURL
-libsync_la_LIBADD += -lcurl
-else
-if HAVE_LIBGNURL
-libsync_la_LIBADD += -lgnurl
-endif
-endif
diff --git a/src/lib/test_sync_api.c b/src/testing/test_sync_api.c
similarity index 100%
rename from src/lib/test_sync_api.c
rename to src/testing/test_sync_api.c
diff --git a/src/lib/test_sync_api.conf b/src/testing/test_sync_api.conf
similarity index 100%
rename from src/lib/test_sync_api.conf
rename to src/testing/test_sync_api.conf
diff --git a/src/lib/test_sync_api_home/.config/taler/exchange/account-2.json 
b/src/testing/test_sync_api_home/.config/taler/exchange/account-2.json
similarity index 100%
rename from src/lib/test_sync_api_home/.config/taler/exchange/account-2.json
rename to src/testing/test_sync_api_home/.config/taler/exchange/account-2.json
diff --git a/src/lib/test_sync_api_home/.config/taler/merchant/account-3.json 
b/src/testing/test_sync_api_home/.config/taler/merchant/account-3.json
similarity index 100%
rename from src/lib/test_sync_api_home/.config/taler/merchant/account-3.json
rename to src/testing/test_sync_api_home/.config/taler/merchant/account-3.json
diff --git a/src/lib/test_sync_api_home/.config/taler/merchant/default.priv 
b/src/testing/test_sync_api_home/.config/taler/merchant/default.priv
similarity index 100%
rename from src/lib/test_sync_api_home/.config/taler/merchant/default.priv
rename to src/testing/test_sync_api_home/.config/taler/merchant/default.priv
diff --git a/src/lib/test_sync_api_home/.config/taler/test.json 
b/src/testing/test_sync_api_home/.config/taler/test.json
similarity index 100%
rename from src/lib/test_sync_api_home/.config/taler/test.json
rename to src/testing/test_sync_api_home/.config/taler/test.json
diff --git 
a/src/lib/test_sync_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
 
b/src/testing/test_sync_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
similarity index 100%
rename from 
src/lib/test_sync_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
rename to 
src/testing/test_sync_api_home/.local/share/taler/auditor/offline-keys/auditor.priv
diff --git 
a/src/lib/test_sync_api_home/.local/share/taler/exchange/offline-keys/master.priv
 
b/src/testing/test_sync_api_home/.local/share/taler/exchange/offline-keys/master.priv
similarity index 100%
rename from 
src/lib/test_sync_api_home/.local/share/taler/exchange/offline-keys/master.priv
rename to 
src/testing/test_sync_api_home/.local/share/taler/exchange/offline-keys/master.priv
diff --git 
a/src/lib/test_sync_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
 
b/src/testing/test_sync_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
similarity index 100%
rename from 
src/lib/test_sync_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
rename to 
src/testing/test_sync_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
diff --git 
a/src/lib/test_sync_api_home/.local/share/taler/merchant/merchant.priv 
b/src/testing/test_sync_api_home/.local/share/taler/merchant/merchant.priv
similarity index 100%
rename from src/lib/test_sync_api_home/.local/share/taler/merchant/merchant.priv
rename to 
src/testing/test_sync_api_home/.local/share/taler/merchant/merchant.priv
diff --git a/src/lib/testing_api_cmd_backup_download.c 
b/src/testing/testing_api_cmd_backup_download.c
similarity index 100%
rename from src/lib/testing_api_cmd_backup_download.c
rename to src/testing/testing_api_cmd_backup_download.c
diff --git a/src/lib/testing_api_cmd_backup_upload.c 
b/src/testing/testing_api_cmd_backup_upload.c
similarity index 100%
rename from src/lib/testing_api_cmd_backup_upload.c
rename to src/testing/testing_api_cmd_backup_upload.c
diff --git a/src/lib/testing_api_helpers.c b/src/testing/testing_api_helpers.c
similarity index 100%
rename from src/lib/testing_api_helpers.c
rename to src/testing/testing_api_helpers.c
diff --git a/src/lib/testing_api_trait_account_priv.c 
b/src/testing/testing_api_trait_account_priv.c
similarity index 100%
rename from src/lib/testing_api_trait_account_priv.c
rename to src/testing/testing_api_trait_account_priv.c
diff --git a/src/lib/testing_api_trait_account_pub.c 
b/src/testing/testing_api_trait_account_pub.c
similarity index 100%
rename from src/lib/testing_api_trait_account_pub.c
rename to src/testing/testing_api_trait_account_pub.c
diff --git a/src/lib/testing_api_trait_hash.c 
b/src/testing/testing_api_trait_hash.c
similarity index 100%
rename from src/lib/testing_api_trait_hash.c
rename to src/testing/testing_api_trait_hash.c

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.