test(fdb-list): moved it to its own directory

ecmwf · Aug 9, 2024 · d8c3ec2 · d8c3ec2
1 parent 39b27cd
commit d8c3ec2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 15 deletions.
diff --git a/tests/fdb/tools/CMakeLists.txt b/tests/fdb/tools/CMakeLists.txt
@@ -1,6 +1,5 @@
 list( APPEND fdb_tools_tests
     fdb_info
-    fdb_list
     fdb_axes )
 
 foreach( _t ${fdb_tools_tests} )
@@ -15,3 +14,5 @@ foreach( _t ${fdb_tools_tests} )
 endforeach()
 
 add_subdirectory( auxiliary )
+
+add_subdirectory( list )
diff --git a/tests/fdb/tools/list/CMakeLists.txt b/tests/fdb/tools/list/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(test_name fdb_list)
+
+configure_file( ${test_name}.sh.in ${test_name}.sh @ONLY )
+
+ecbuild_add_test(
+    TYPE SCRIPT
+    CONDITION HAVE_FDB_BUILD_TOOLS
+    COMMAND ${test_name}.sh)
diff --git a/tests/fdb/tools/fdb_list.sh.in → tests/fdb/tools/list/fdb_list.sh.in b/tests/fdb/tools/fdb_list.sh.in → tests/fdb/tools/list/fdb_list.sh.in
@@ -39,7 +39,7 @@ try grib_set -s step=6 x.grib 6.grib
 try grib_set -s step=9 x.grib 9.grib
 
 for f in *.grib; do
-  try grib_set -s type=an "$f" "cf.$f"
+  try grib_set -s type=cf "$f" "cf.$f"
 done
 
 for f in *.grib; do
@@ -55,10 +55,10 @@ exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc,levtype=sfc}{step=12,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc,levtype=sfc}{step=6,param=166}
 {class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc,levtype=sfc}{step=9,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=0,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=12,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=6,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=9,param=166}"
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=0,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=12,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=6,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=9,param=166}"
 try test "$exp" = "$out"
 
 # test date depth=1
@@ -69,23 +69,23 @@ try test "$exp" = "$out"
 # test date depth=2
 out=$(fdb-list date=20201102 --minimum-keys="" --porcelain --depth=2)
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=fc,levtype=sfc}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}"
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}"
 try test "$exp" = "$out"
 
 # test cf depth=1
-out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=1)
+out=$(fdb-list type=cf --minimum-keys="" --porcelain --depth=1)
 exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}"
 try test "$exp" = "$out"
 
 # test cf depth=2
-out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=2)
-exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}"
+out=$(fdb-list type=cf --minimum-keys="" --porcelain --depth=2)
+exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}"
 try test "$exp" = "$out"
 
 # test cf depth=3
-out=$(fdb-list type=an --minimum-keys="" --porcelain --depth=3)
-exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=0,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=12,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=6,param=166}
-{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=an,levtype=sfc}{step=9,param=166}"
+out=$(fdb-list type=cf --minimum-keys="" --porcelain --depth=3)
+exp="{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=0,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=12,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=6,param=166}
+{class=rd,expver=xxxx,stream=oper,date=20201102,time=0000,domain=g}{type=cf,levtype=sfc}{step=9,param=166}"
 try test "$exp" = "$out"
diff --git a/tests/fdb/tools/list/local.yaml b/tests/fdb/tools/list/local.yaml
@@ -0,0 +1,6 @@
+---
+type: local
+engine: toc
+spaces:
+ - roots:
+   - path: ./localroot
diff --git a/tests/fdb/tools/list/x.grib b/tests/fdb/tools/list/x.grib
@@ -0,0 +1 @@
+../../../regressions/FDB-307/x.grib