[Git][reproducible-builds/disorderfs][debian] 13 commits: Add a quick benchmark. (Re. reproducible-builds/disorderfs#6)

Tue Jan 19 12:09:29 UTC 2021


Holger Levsen pushed to branch debian at Reproducible Builds / disorderfs


Commits:
a4503fe2 by Chris Lamb at 2020-12-18T16:54:44+00:00
Add a quick benchmark. (Re. reproducible-builds/disorderfs#6)

- - - - -
869ec003 by Chris Lamb at 2020-12-18T17:16:09+00:00
Add a .gitlab-ci.yml as a test.

It will likely fail due to FUSE requirements.

- - - - -
80d9147e by Chris Lamb at 2020-12-18T17:21:15+00:00
We need the debian branch to test.

- - - - -
3fa9506b by Chris Lamb at 2020-12-18T17:26:02+00:00
Don't merge the debian branch.

- - - - -
ae7e5d88 by Chris Lamb at 2020-12-18T17:27:49+00:00
Add build-essential to dependencies.

- - - - -
488ebb76 by Chris Lamb at 2020-12-18T17:30:33+00:00
Install fuse3 when testing.

- - - - -
1e29fbf9 by Chris Lamb at 2020-12-19T12:21:04+00:00
Now make test failures fail the build.

- - - - -
056270ef by Chris Lamb at 2021-01-06T11:24:16+00:00
Add "du" to the benchmark.

- - - - -
20c4ea09 by Frédéric Pierret (fepitre) at 2021-01-19T12:49:45+01:00
Makefile: allow to prepend flags in CXXFLAGS and enable debug flag

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
ad63c994 by Frédéric Pierret (fepitre) at 2021-01-19T12:50:00+01:00
Add RPM spec file

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
c055b4c2 by Holger Levsen at 2021-01-19T12:52:23+01:00
Release 0.5.11

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
fe50f593 by Holger Levsen at 2021-01-19T12:53:07+01:00
Merge tag '0.5.11' into debian

Release 0.5.11

- - - - -
b1ebe03f by Holger Levsen at 2021-01-19T12:58:16+01:00
release as 0.5.11-1

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


7 changed files:

- + .gitlab-ci.yml
- Makefile
- NEWS
- debian/changelog
- disorderfs.cpp
- + disorderfs.spec
- + tests/test_benchmark


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -0,0 +1,26 @@
+stages:
+  - test
+
+.test_template: &test
+  stage: test
+  variables:
+    DEBIAN_FRONTEND: noninteractive
+  script:
+    - apt-get -q update
+    - mount -o remount,rw /dev
+    - apt-get -q -y install --no-install-recommends build-essential libfuse-dev pkg-config bc fuse3
+    - make test
+  except:
+    - debian
+
+unstable:
+  <<: *test
+  image: debian:unstable
+
+testing:
+  <<: *test
+  image: debian:testing
+
+stable-bpo:
+  <<: *test
+  image: debian:stable-backports


=====================================
Makefile
=====================================
@@ -20,7 +20,6 @@
 
 # Note: uses GNU Make features
 
-CXXFLAGS ?= -Wall -Wextra -pedantic -O2
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
 MANDIR ?= $(PREFIX)/share/man
@@ -35,6 +34,7 @@ FUSE_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags fuse) -DFUSE_USE_VERSION=26
 FUSE_LIBS ?= $(shell $(PKG_CONFIG) --libs fuse) -lulockmgr
 
 # CXXFLAGS
+CXXFLAGS += -Wall -Wextra -pedantic -O2 -g
 CXXFLAGS += -std=c++11 -Wno-unused-parameter
 CXXFLAGS += $(FUSE_CFLAGS)
 


=====================================
NEWS
=====================================
@@ -1,3 +1,8 @@
+v0.5.11 (2020-01-19)
+  * Improve tests.
+  * Add RPM spec file
+  * Makefile: allow to prepend flags in CXXFLAGS.
+
 v0.5.2 (2017-08-21)
   * Add -q, --quiet options to avoid printing to stdout.
 


=====================================
debian/changelog
=====================================
@@ -1,8 +1,10 @@
-disorderfs (0.5.10-3) UNRELEASED; urgency=medium
+disorderfs (0.5.11-1) unstable; urgency=medium
 
-  * WIP - changelog will be generated with gbp-dch upon release.
+  [ Holger Levsen ]
+  * New upstream release.
+  * Update standards version to 4.5.1, no changes needed.
 
- -- Holger Levsen <holger at debian.org>  Fri, 20 Nov 2020 09:26:05 +0100
+ -- Holger Levsen <holger at debian.org>  Tue, 19 Jan 2021 12:56:37 +0100
 
 disorderfs (0.5.10-2) unstable; urgency=medium
 


=====================================
disorderfs.cpp
=====================================
@@ -43,7 +43,7 @@ extern "C" {
 #include <sys/file.h>
 #include <stddef.h>
 
-#define DISORDERFS_VERSION "0.5.10"
+#define DISORDERFS_VERSION "0.5.11"
 
 namespace {
 std::vector<std::string>        bare_arguments;


=====================================
disorderfs.spec
=====================================
@@ -0,0 +1,41 @@
+Name:           disorderfs
+Version:        0.5.11
+Release:        1%{?dist}
+Summary:        FUSE filesystem that introduces non-determinism
+
+License:        GPL-3+
+Source0:        https://salsa.debian.org/reproducible-builds/%{name}/-/archive/%{version}/%{name}-%{version}.tar.gz
+BuildArch:      x86_64
+
+BuildRequires:  gcc-c++
+BuildRequires:  fuse-devel
+BuildRequires:  pkg-config
+BuildRequires:  asciidoc
+
+Requires:       bc
+Requires:       fuse3
+
+%description
+disorderfs is an overlay FUSE filesystem that introduces non-determinism
+into filesystem metadata.  For example, it can randomize the order
+in which directory entries are read.  This is useful for detecting
+non-determinism in the build process.
+
+%prep
+%autosetup -n %{name}-%{version}
+
+%build
+%set_build_flags
+%make_build
+
+%install
+%make_install PREFIX=/usr
+
+%files
+%doc README
+%{_bindir}/disorderfs
+%{_datadir}/man/man1/disorderfs.1.gz
+
+%changelog
+* Tue Jan 19 2021 Frédéric Pierret (fepitre) <frederic.pierret at qubes-os.org> - 0.5.11-1
+- Initial RPM packaging.


=====================================
tests/test_benchmark
=====================================
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+. ./common
+
+LOOPS=3000
+
+Start () {
+	START="$(date +%s.%N)"
+}
+
+Stop () {
+	SUFFIX="${1}"
+	DURATION="$(echo "$(date +%s.%N) - ${START}" | bc)"
+	printf "Took %.3fs %s\n" "${DURATION}" "${SUFFIX}"
+}
+
+Start
+for X in $(seq "${LOOPS}")
+do
+	find fixtures -ls >/dev/null
+	du -s fixtures >/dev/null
+done
+Stop "without disorderfs"
+
+Mount
+Start
+for X in $(seq "${LOOPS}")
+do
+	find target -ls >/dev/null
+	du -s target >/dev/null
+done
+Stop "with disorderfs"
+Unmount



View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/-/compare/0cd14407e271b9205b6698bdbb8feb6939ce2658...b1ebe03fe22da5ceb949f080544cf9a53bb5069d

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/disorderfs/-/compare/0cd14407e271b9205b6698bdbb8feb6939ce2658...b1ebe03fe22da5ceb949f080544cf9a53bb5069d
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20210119/5bc768d0/attachment.htm>
