Merge branch 'distcheck-ci' into 'staging'

[ci] additional distribution check

See merge request !164

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
   - style
   - build
   - docs
-  - release
+  - distribution
 
 repoquality:
   stage: style
@@ -205,3 +205,27 @@ readthedocs:
   script:
     - nix run nixpkgs.curl -c curl -X POST -d "branches=$CI_COMMIT_REF_NAME" -d "token=$READTHEDOCS_TOKEN" https://readthedocs.org/api/v2/webhook/argo-aml/83161/
 
+distcheck:
+  tags:
+    - nix
+    - kvm
+  stage: distribution
+  except:
+    - /^wip.*/
+    - /^WIP.*/
+  variables:
+    CFLAGS: "-std=c99 -pedantic -Wall -Wextra -Werror -Wno-unused-but-set-parameter -Wno-builtin-declaration-mismatch"
+  script:
+    - |
+      nix-shell --run bash <<< '
+        ./autogen.sh
+        mkdir build
+        ./configure --prefix=`pwd`/build
+        make distcheck
+        chmod -R +w aml-*
+      '
+  artifacts:
+    when: on_failure
+    paths:
+      - config.log
+      - tests/*.log

excit @ 6cbe5c57

-Subproject commit c586cb402c8d2b89efdde6ab41a65473c1edc2e0
+Subproject commit 6cbe5c57b5b465a8fb42d06304b27ef95edd6639

include/Makefile.am

@@ -10,6 +10,7 @@ include_aml_layoutdir=$(includedir)/aml/layout
 include_aml_layout_HEADERS = \
 			      aml/layout/native.h \
 			      aml/layout/dense.h \
+			      aml/layout/pad.h \
 			      aml/layout/sparse.h \
 			      aml/layout/reshape.h
 

tests/Makefile.am

@@ -37,16 +37,18 @@ if HAVE_CUDA
 AREA_TESTS += area/test_cuda
 endif
 
-noinst_LTLIBRARIES = liblayout_test.la
-liblayout_test_la_CPPFLAGS =
-liblayout_test_la_LDFLAGS =
 liblayout_test_la_SOURCES = \
+	layout/test_layout.h \
 	layout/coords.c \
 	layout/dense.c \
 	layout/layout.c \
 	layout/reshape.c
-liblayout_test_la_LIBADD = ../src/libaml.la
-LDADD = liblayout_test.la
+
+libreplicaset_test_la_SOURCES = \
+	replicaset/test_replicaset.h \
+	replicaset/common.c
+
+LDADD = liblayout_test.la libreplicaset_test.la
 
 LAYOUT_TESTS = \
 	layout/test_coords \
@@ -60,6 +62,7 @@ TILING_TESTS = tiling/test_tiling
 DMA_TESTS = dma/test_dma_linux_seq \
 		  dma/test_dma_linux_par
 
+
 REPLICASET_TESTS =
 
 if HAVE_CUDA
@@ -84,6 +87,7 @@ UNIT_TESTS = $(UTILS_TESTS) \
 # all tests
 TST_PROGS = $(UNIT_TESTS)
 check_PROGRAMS = $(TST_PROGS)
+check_LTLIBRARIES = liblayout_test.la libreplicaset_test.la
 TESTS = $(TST_PROGS)
 
 # phony target to allow us to compile the check programs without running the

tests/replicaset/test_replicaset.c → tests/replicaset/common.c

@@ -8,15 +8,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************/
 
-#include <assert.h>
+#include "test_replicaset.h"
 
-#include "aml.h"
-
-#include "aml/higher/replicaset.h"
-
-/**
- * Common replicaset test.
- */
 void test_replicaset(struct aml_replicaset *replicaset,
                      const void *src,
                      int (*comp)(const void *, const void *, size_t))

tests/replicaset/test_hwloc.c

@@ -8,12 +8,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  ******************************************************************************/
 
-#include "test_replicaset.c"
+#include "test_replicaset.h"
 
 #include <stdlib.h>
 
-#include "aml.h"
-
 #include "aml/higher/replicaset/hwloc.h"
 
 const size_t size = 1 << 20; // 1 Mo

tests/replicaset/test_replicaset.h

+/*******************************************************************************
+ * Copyright 2019 UChicago Argonne, LLC.
+ * (c.f. AUTHORS, LICENSE)
+ *
+ * This file is part of the AML project.
+ * For more info, see https://xgitlab.cels.anl.gov/argo/aml
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ ******************************************************************************/
+
+#include "aml.h"
+
+#include "aml/higher/replicaset.h"
+
+#ifndef TEST_REPLICASET_H
+#define TEST_REPLICASET_H 1
+
+void test_replicaset(struct aml_replicaset *replicaset,
+                     const void *src,
+                     int (*comp)(const void *, const void *, size_t));
+
+#endif