summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2026-04-24 20:36:26 +0300
committerPaul Buetow <paul@buetow.org>2026-04-24 20:36:26 +0300
commit92a36a8c5f23756b8c6d721e89450752409ddd75 (patch)
tree52adee49828831feb0ca557e7df736726faedac3
parentfadbf135d0b251387fd785083df79e27d1025cac (diff)
task a8: move all binaries under ./cmd/<name>/main.go
Relocates the two non-canonical main packages so every binary in the repo lives at ./cmd/<BINARY>/main.go: - tools/filewriter/ -> cmd/filewriter/ - integrationtests/cmd/ioworkload/ (20 files) -> cmd/ioworkload/ Consumers updated: - Magefile.go: workloadSourcePath now ./cmd/ioworkload - integrationtests/README.md: structure note points at ../cmd/ioworkload Files moved with git mv so git log --follow history is preserved. cmd/ior/main.go was already canonical and is untouched. Verified: mage build produces the ior binary; go build ./cmd/... builds filewriter and ioworkload; go test ./cmd/ioworkload passes; go vet ./cmd/filewriter ./cmd/ioworkload is clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
-rw-r--r--Magefile.go2
-rw-r--r--cmd/filewriter/main.go (renamed from tools/filewriter/main.go)0
-rw-r--r--cmd/ioworkload/main.go (renamed from integrationtests/cmd/ioworkload/main.go)0
-rw-r--r--cmd/ioworkload/scenario_close.go (renamed from integrationtests/cmd/ioworkload/scenario_close.go)0
-rw-r--r--cmd/ioworkload/scenario_copy_file_range.go (renamed from integrationtests/cmd/ioworkload/scenario_copy_file_range.go)0
-rw-r--r--cmd/ioworkload/scenario_dir.go (renamed from integrationtests/cmd/ioworkload/scenario_dir.go)0
-rw-r--r--cmd/ioworkload/scenario_dup.go (renamed from integrationtests/cmd/ioworkload/scenario_dup.go)0
-rw-r--r--cmd/ioworkload/scenario_fcntl.go (renamed from integrationtests/cmd/ioworkload/scenario_fcntl.go)0
-rw-r--r--cmd/ioworkload/scenario_iouring.go (renamed from integrationtests/cmd/ioworkload/scenario_iouring.go)0
-rw-r--r--cmd/ioworkload/scenario_link.go (renamed from integrationtests/cmd/ioworkload/scenario_link.go)0
-rw-r--r--cmd/ioworkload/scenario_mmap.go (renamed from integrationtests/cmd/ioworkload/scenario_mmap.go)0
-rw-r--r--cmd/ioworkload/scenario_open.go (renamed from integrationtests/cmd/ioworkload/scenario_open.go)0
-rw-r--r--cmd/ioworkload/scenario_pidfd.go (renamed from integrationtests/cmd/ioworkload/scenario_pidfd.go)0
-rw-r--r--cmd/ioworkload/scenario_pidfd_test.go (renamed from integrationtests/cmd/ioworkload/scenario_pidfd_test.go)0
-rw-r--r--cmd/ioworkload/scenario_readwrite.go (renamed from integrationtests/cmd/ioworkload/scenario_readwrite.go)0
-rw-r--r--cmd/ioworkload/scenario_rename.go (renamed from integrationtests/cmd/ioworkload/scenario_rename.go)0
-rw-r--r--cmd/ioworkload/scenario_stat.go (renamed from integrationtests/cmd/ioworkload/scenario_stat.go)0
-rw-r--r--cmd/ioworkload/scenario_sync.go (renamed from integrationtests/cmd/ioworkload/scenario_sync.go)0
-rw-r--r--cmd/ioworkload/scenario_truncate.go (renamed from integrationtests/cmd/ioworkload/scenario_truncate.go)0
-rw-r--r--cmd/ioworkload/scenario_unlink.go (renamed from integrationtests/cmd/ioworkload/scenario_unlink.go)0
-rw-r--r--cmd/ioworkload/scenarios.go (renamed from integrationtests/cmd/ioworkload/scenarios.go)0
-rw-r--r--integrationtests/README.md2
22 files changed, 2 insertions, 2 deletions
diff --git a/Magefile.go b/Magefile.go
index 95e4c0c..fa04d31 100644
--- a/Magefile.go
+++ b/Magefile.go
@@ -34,7 +34,7 @@ const (
bpfSourcePath = "internal/c/ior.bpf.c"
bpfObjectPath = "internal/c/ior.bpf.o"
bpfOutputPath = "ior.bpf.o"
- workloadSourcePath = "./integrationtests/cmd/ioworkload"
+ workloadSourcePath = "./cmd/ioworkload"
tracepointsCPath = "internal/c/generated_tracepoints.c"
tracepointsResult = "internal/c/generated_tracepoints_result.txt"
tracepointsResultNew = "internal/c/generated_tracepoints_result.txt.new"
diff --git a/tools/filewriter/main.go b/cmd/filewriter/main.go
index 25f5cb7..25f5cb7 100644
--- a/tools/filewriter/main.go
+++ b/cmd/filewriter/main.go
diff --git a/integrationtests/cmd/ioworkload/main.go b/cmd/ioworkload/main.go
index 0276a9c..0276a9c 100644
--- a/integrationtests/cmd/ioworkload/main.go
+++ b/cmd/ioworkload/main.go
diff --git a/integrationtests/cmd/ioworkload/scenario_close.go b/cmd/ioworkload/scenario_close.go
index fc5044c..fc5044c 100644
--- a/integrationtests/cmd/ioworkload/scenario_close.go
+++ b/cmd/ioworkload/scenario_close.go
diff --git a/integrationtests/cmd/ioworkload/scenario_copy_file_range.go b/cmd/ioworkload/scenario_copy_file_range.go
index ce0524e..ce0524e 100644
--- a/integrationtests/cmd/ioworkload/scenario_copy_file_range.go
+++ b/cmd/ioworkload/scenario_copy_file_range.go
diff --git a/integrationtests/cmd/ioworkload/scenario_dir.go b/cmd/ioworkload/scenario_dir.go
index 7a78716..7a78716 100644
--- a/integrationtests/cmd/ioworkload/scenario_dir.go
+++ b/cmd/ioworkload/scenario_dir.go
diff --git a/integrationtests/cmd/ioworkload/scenario_dup.go b/cmd/ioworkload/scenario_dup.go
index 6a89970..6a89970 100644
--- a/integrationtests/cmd/ioworkload/scenario_dup.go
+++ b/cmd/ioworkload/scenario_dup.go
diff --git a/integrationtests/cmd/ioworkload/scenario_fcntl.go b/cmd/ioworkload/scenario_fcntl.go
index 0c97002..0c97002 100644
--- a/integrationtests/cmd/ioworkload/scenario_fcntl.go
+++ b/cmd/ioworkload/scenario_fcntl.go
diff --git a/integrationtests/cmd/ioworkload/scenario_iouring.go b/cmd/ioworkload/scenario_iouring.go
index a16d59a..a16d59a 100644
--- a/integrationtests/cmd/ioworkload/scenario_iouring.go
+++ b/cmd/ioworkload/scenario_iouring.go
diff --git a/integrationtests/cmd/ioworkload/scenario_link.go b/cmd/ioworkload/scenario_link.go
index beb49a0..beb49a0 100644
--- a/integrationtests/cmd/ioworkload/scenario_link.go
+++ b/cmd/ioworkload/scenario_link.go
diff --git a/integrationtests/cmd/ioworkload/scenario_mmap.go b/cmd/ioworkload/scenario_mmap.go
index e7b9f02..e7b9f02 100644
--- a/integrationtests/cmd/ioworkload/scenario_mmap.go
+++ b/cmd/ioworkload/scenario_mmap.go
diff --git a/integrationtests/cmd/ioworkload/scenario_open.go b/cmd/ioworkload/scenario_open.go
index 1aebec1..1aebec1 100644
--- a/integrationtests/cmd/ioworkload/scenario_open.go
+++ b/cmd/ioworkload/scenario_open.go
diff --git a/integrationtests/cmd/ioworkload/scenario_pidfd.go b/cmd/ioworkload/scenario_pidfd.go
index 2aafced..2aafced 100644
--- a/integrationtests/cmd/ioworkload/scenario_pidfd.go
+++ b/cmd/ioworkload/scenario_pidfd.go
diff --git a/integrationtests/cmd/ioworkload/scenario_pidfd_test.go b/cmd/ioworkload/scenario_pidfd_test.go
index 5ee1002..5ee1002 100644
--- a/integrationtests/cmd/ioworkload/scenario_pidfd_test.go
+++ b/cmd/ioworkload/scenario_pidfd_test.go
diff --git a/integrationtests/cmd/ioworkload/scenario_readwrite.go b/cmd/ioworkload/scenario_readwrite.go
index c676b90..c676b90 100644
--- a/integrationtests/cmd/ioworkload/scenario_readwrite.go
+++ b/cmd/ioworkload/scenario_readwrite.go
diff --git a/integrationtests/cmd/ioworkload/scenario_rename.go b/cmd/ioworkload/scenario_rename.go
index 685157b..685157b 100644
--- a/integrationtests/cmd/ioworkload/scenario_rename.go
+++ b/cmd/ioworkload/scenario_rename.go
diff --git a/integrationtests/cmd/ioworkload/scenario_stat.go b/cmd/ioworkload/scenario_stat.go
index 5d242c7..5d242c7 100644
--- a/integrationtests/cmd/ioworkload/scenario_stat.go
+++ b/cmd/ioworkload/scenario_stat.go
diff --git a/integrationtests/cmd/ioworkload/scenario_sync.go b/cmd/ioworkload/scenario_sync.go
index df1c59c..df1c59c 100644
--- a/integrationtests/cmd/ioworkload/scenario_sync.go
+++ b/cmd/ioworkload/scenario_sync.go
diff --git a/integrationtests/cmd/ioworkload/scenario_truncate.go b/cmd/ioworkload/scenario_truncate.go
index 04288d5..04288d5 100644
--- a/integrationtests/cmd/ioworkload/scenario_truncate.go
+++ b/cmd/ioworkload/scenario_truncate.go
diff --git a/integrationtests/cmd/ioworkload/scenario_unlink.go b/cmd/ioworkload/scenario_unlink.go
index ea73b10..ea73b10 100644
--- a/integrationtests/cmd/ioworkload/scenario_unlink.go
+++ b/cmd/ioworkload/scenario_unlink.go
diff --git a/integrationtests/cmd/ioworkload/scenarios.go b/cmd/ioworkload/scenarios.go
index 6910314..6910314 100644
--- a/integrationtests/cmd/ioworkload/scenarios.go
+++ b/cmd/ioworkload/scenarios.go
diff --git a/integrationtests/README.md b/integrationtests/README.md
index 0036019..c397f8b 100644
--- a/integrationtests/README.md
+++ b/integrationtests/README.md
@@ -58,7 +58,7 @@ If the suite fails before tracing starts, check for these common causes:
## Structure
-- `cmd/ioworkload/` — Standalone binary performing known I/O patterns
+- `../cmd/ioworkload/` — Standalone binary performing known I/O patterns (lives at repo-root `cmd/`)
- `harness.go` — Test orchestration (start ior + workload, collect output)
- `parse.go` — Parse `.ior.zst` into assertable `TestResult`
- `expectations.go` — `ExpectedEvent` type and assertion helpers