Move scripts around

Author: mbrt

Makefile

@@ -116,11 +116,11 @@ clean:
 	rm -f $(BIN)/$(NAME) $(PAM_MODULE) $(TOOLS) coverage.out $(COVERAGE_FILES) $(PAM_CONFIG)
 
 ###### Cgroup testdata ######
-.PHONY: generate-cgroupv1-testdata generate-cgroupv2-testdata
-generate-cgroupv1-testdata:
-	bin/generate-cgroupv1-testdata
-generate-cgroupv2-testdata:
-	bin/generate-cgroupv2-testdata
+.PHONY: gen-cgroupv1-testdata gen-cgroupv2-testdata
+gen-cgroupv1-testdata:
+	bin/gen-cgroupv1-testdata
+gen-cgroupv2-testdata:
+	bin/gen-cgroupv2-testdata
 
 ###### Go tests ######
 .PHONY: test test-setup test-teardown

bin/generate-cgroupv1-testdata bin/gen-cgroupv1-testdatabin/generate-cgroupv1-testdata renamed to bin/gen-cgroupv1-testdata

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 #
-# generate-cgroupv1-testdata - Generate cgroup v1 testdata by running
+# gen-cgroupv1-testdata - Generate cgroup v1 testdata by running
 # bin/snapshot-cgroup inside Docker containers with known resource limits,
 # inside a Lima VM running Ubuntu 20.04 (which uses cgroup v1 by default).
 #
-# Usage: generate-cgroupv1-testdata
+# Usage: gen-cgroupv1-testdata
 #
 # Prerequisites:
 #   Lima with a running "cgroupv1" instance:
-#     limactl start --name=cgroupv1 bin/cgroupv1.yaml
+#     limactl start --name=cgroupv1 cgroup/testdata/cgroupv1.yaml
 #
 # Each testdata directory contains:
 #   expected.json  - {"cpu_quota": <float>, "memory_limit": <int>}
@@ -28,7 +28,7 @@ ensure_lima_vm() {
         | jq -e "select(.name == \"$lima_instance\" and .status == \"Running\")" \
             >/dev/null 2>&1; then
         echo "Error: Lima instance '$lima_instance' is not running." >&2
-        echo "Start it with:  limactl start --name=$lima_instance bin/cgroupv1.yaml" >&2
+        echo "Start it with:  limactl start --name=$lima_instance cgroup/testdata/cgroupv1.yaml" >&2
         exit 1
     fi
 }

bin/generate-cgroupv2-testdata bin/gen-cgroupv2-testdatabin/generate-cgroupv2-testdata renamed to bin/gen-cgroupv2-testdata

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 #
-# generate-cgroupv2-testdata - Generate cgroup v2 testdata by running
+# gen-cgroupv2-testdata - Generate cgroup v2 testdata by running
 # bin/snapshot-cgroup inside Docker containers with known resource limits.
 #
-# Usage: generate-cgroupv2-testdata
+# Usage: gen-cgroupv2-testdata
 #
 # Prerequisites: Docker on a host running cgroup v2.
 #

cgroup/cgroup_test.go

@@ -491,7 +491,7 @@ type testdataExpected struct {
 // by bin/snapshot-cgroup. Each subdirectory of testdata/ is a separate test
 // case containing a proc/ and sys/ tree plus an expected.json.
 //
-// Regenerate with: bin/generate-cgroupv1-testdata and bin/generate-cgroupv2-testdata
+// Regenerate with: bin/gen-cgroupv1-testdata and bin/gen-cgroupv2-testdata
 func TestWithRootFromTestdata(t *testing.T) {
 	entries, err := os.ReadDir("testdata")
 	if err != nil {

bin/cgroupv1.yaml cgroup/testdata/cgroupv1.yamlbin/cgroupv1.yaml renamed to cgroup/testdata/cgroupv1.yaml

@@ -5,8 +5,8 @@
 # be launched with --cpus / --memory resource limits.
 #
 # Usage:
-#   limactl start --name=cgroupv1 bin/cgroupv1.yaml
-#   bin/generate-cgroupv1-testdata
+#   limactl start --name=cgroupv1 cgroup/testdata/cgroupv1.yaml
+#   bin/gen-cgroupv1-testdata
 #   limactl stop cgroupv1          # when done
 
 images: