testsuite: update commands, expected, jobspecs for t3035

Problem: t3035 expected output doesn't include sub-slot resources
allocated implicitly. Furthermore, the aggregate filter counts do not
accurately reflect the occupied resources.

Update the expected output to include the full set of allocated
resources, and update jobspecs and commands to test for desired
behavior. That includes checking for jobid tags and adjusting the slot
location for some jobspecs.

Author: milroy

t/data/resource/commands/remove/cmds07.in

@@ -2,8 +2,8 @@ find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 remove /tiny0/rack0/node1 true
-find jobid-alloc=2 agfilter=t
-find jobid-alloc=1 agfilter=t
+find jobid-span=2 agfilter=t
+find jobid-span=1 agfilter=t
 find agfilter=t
 cancel 1
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml

t/data/resource/commands/remove/cmds08.in

@@ -2,8 +2,8 @@ find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 remove [1] false
-find jobid-alloc=2 agfilter=t
-find jobid-alloc=1 agfilter=t
+find jobid-span=2 agfilter=t
+find jobid-span=1 agfilter=t
 find agfilter=t
 cancel 1
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml

t/data/resource/commands/remove/cmds09.in

@@ -1,12 +1,12 @@
 find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test002.yaml
 remove [0] false
-find jobid-alloc=1 agfilter=t
+find jobid-span=1 agfilter=t
 find agfilter=t
 cancel 1
 find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
-find jobid-alloc=2 agfilter=t
+find jobid-span=2 agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 find agfilter=t
 quit

t/data/resource/commands/remove/cmds10.in

@@ -1,12 +1,12 @@
 find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test002.yaml
 remove [0] false
-find jobid-alloc=1 agfilter=t
+find jobid-span=1 agfilter=t
 find agfilter=t
 cancel 1
 find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
-find jobid-alloc=2 agfilter=t
+find jobid-span=2 agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 find agfilter=t
 quit

t/data/resource/commands/remove/cmds11.in

@@ -2,7 +2,7 @@ find agfilter=t
 remove [0] false
 find agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
-find jobid-alloc=1 agfilter=t
+find jobid-span=1 agfilter=t
 match allocate @TEST_SRCDIR@/data/resource/jobspecs/remove/test001.yaml
 find agfilter=t
 quit

t/data/resource/expected/remove/004.R.out

@@ -119,6 +119,11 @@ INFO: =============================
       ---------------core15[1:x]
       ---------------core16[1:x]
       ---------------core17[1:x]
+      ---------------gpu0[1:x]
+      ---------------memory0[2:x]
+      ---------------memory1[2:x]
+      ---------------memory2[2:x]
+      ---------------memory3[2:x]
       ------------socket0[1:x]
       ---------------core18[1:x]
       ---------------core19[1:x]
@@ -138,6 +143,11 @@ INFO: =============================
       ---------------core33[1:x]
       ---------------core34[1:x]
       ---------------core35[1:x]
+      ---------------gpu1[1:x]
+      ---------------memory4[2:x]
+      ---------------memory5[2:x]
+      ---------------memory6[2:x]
+      ---------------memory7[2:x]
       ------------socket1[1:x]
       ---------node1[1:x]
       ------rack0[1:s]

t/data/resource/expected/remove/005.R.out

@@ -119,6 +119,11 @@ INFO: =============================
       ---------------core15[1:x]
       ---------------core16[1:x]
       ---------------core17[1:x]
+      ---------------gpu0[1:x]
+      ---------------memory0[2:x]
+      ---------------memory1[2:x]
+      ---------------memory2[2:x]
+      ---------------memory3[2:x]
       ------------socket0[1:x]
       ---------------core18[1:x]
       ---------------core19[1:x]
@@ -138,6 +143,11 @@ INFO: =============================
       ---------------core33[1:x]
       ---------------core34[1:x]
       ---------------core35[1:x]
+      ---------------gpu1[1:x]
+      ---------------memory4[2:x]
+      ---------------memory5[2:x]
+      ---------------memory6[2:x]
+      ---------------memory7[2:x]
       ------------socket1[1:x]
       ---------node0[1:x]
       ------rack0[1:s]

t/data/resource/expected/remove/006.R.out

@@ -1,4 +1,26 @@
       ---------------core0[1:x]
+      ---------------core1[1:x]
+      ---------------core2[1:x]
+      ---------------core3[1:x]
+      ---------------core4[1:x]
+      ---------------core5[1:x]
+      ---------------core6[1:x]
+      ---------------core7[1:x]
+      ---------------core8[1:x]
+      ---------------core9[1:x]
+      ---------------core10[1:x]
+      ---------------core11[1:x]
+      ---------------core12[1:x]
+      ---------------core13[1:x]
+      ---------------core14[1:x]
+      ---------------core15[1:x]
+      ---------------core16[1:x]
+      ---------------core17[1:x]
+      ---------------gpu0[1:x]
+      ---------------memory0[2:x]
+      ---------------memory1[2:x]
+      ---------------memory2[2:x]
+      ---------------memory3[2:x]
       ------------socket0[1:x]
       ---------node0[1:s]
       ------rack0[1:s]
@@ -9,6 +31,28 @@ INFO: RESOURCES=ALLOCATED
 INFO: SCHEDULED AT=Now
 INFO: =============================
       ---------------core18[1:x]
+      ---------------core19[1:x]
+      ---------------core20[1:x]
+      ---------------core21[1:x]
+      ---------------core22[1:x]
+      ---------------core23[1:x]
+      ---------------core24[1:x]
+      ---------------core25[1:x]
+      ---------------core26[1:x]
+      ---------------core27[1:x]
+      ---------------core28[1:x]
+      ---------------core29[1:x]
+      ---------------core30[1:x]
+      ---------------core31[1:x]
+      ---------------core32[1:x]
+      ---------------core33[1:x]
+      ---------------core34[1:x]
+      ---------------core35[1:x]
+      ---------------gpu1[1:x]
+      ---------------memory4[2:x]
+      ---------------memory5[2:x]
+      ---------------memory6[2:x]
+      ---------------memory7[2:x]
       ------------socket1[1:x]
       ---------node0[1:s]
       ------rack0[1:s]