From 258a490e705c2ef53fc8f404198d322f01d5f934 Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Fri, 15 Apr 2022 15:02:17 -0400 Subject: [PATCH 1/7] add version constraints to opam file --- petr4.opam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/petr4.opam b/petr4.opam index 62f88dd03..1c629cbf4 100644 --- a/petr4.opam +++ b/petr4.opam @@ -22,7 +22,7 @@ depends: [ "dune" {>= "1.2"} "cstruct" "cstruct-sexp" - "menhir" + "menhir" {<= "20211128"} "ANSITerminal" "core" {>= "0.13.0"} "ppx_deriving_yojson" @@ -32,7 +32,7 @@ depends: [ "js_of_ocaml" "js_of_ocaml-lwt" "js_of_ocaml-ppx" - "p4pp" {>= "0.1.8"} + "p4pp" {<= "0.1.7"} "odoc" "ppx_expect" {>= "0.15.0"} "pp" {>= "1.0.1"} From c82bad4e9652b6fe889bad7ad59999f4f833847c Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Fri, 15 Apr 2022 15:04:27 -0400 Subject: [PATCH 2/7] fix ci scripts --- .github/scripts/build-petr4-macos.sh | 22 +-------------------- .github/scripts/build-petr4-ubuntu.sh | 24 +---------------------- .github/scripts/typecheck-petr4-vs-p4c.sh | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/.github/scripts/build-petr4-macos.sh b/.github/scripts/build-petr4-macos.sh index fb22ae6a0..582fdcdd7 100755 --- a/.github/scripts/build-petr4-macos.sh +++ b/.github/scripts/build-petr4-macos.sh @@ -8,34 +8,14 @@ set -x # Make command execution verbose export PETR4_DEPS="m4 \ gmp" -export PETR4_DEPS_OPAM="ANSITerminal \ - alcotest \ - bignum \ - cstruct-sexp \ - pp \ - ppx_deriving \ - ppx_deriving_yojson \ - yojson \ - js_of_ocaml \ - js_of_ocaml-lwt \ - js_of_ocaml-ppx" - # install dependencies brew update brew install \ ${PETR4_DEPS} opam update opam upgrade -opam uninstall menhir -opam install menhir.20211128 -# install p4pp -# opam switch create 4.09.1 -opam pin add p4pp 0.1.7 -# opam pin add p4pp https://github.com/cornell-netlab/p4pp.git eval $(opam env) -#dune external-lib-deps --missing @install -opam install \ - ${PETR4_DEPS_OPAM} +opam install . --deps-only # build petr4 dune build --profile release diff --git a/.github/scripts/build-petr4-ubuntu.sh b/.github/scripts/build-petr4-ubuntu.sh index 559b06bd0..20b420b07 100755 --- a/.github/scripts/build-petr4-ubuntu.sh +++ b/.github/scripts/build-petr4-ubuntu.sh @@ -9,36 +9,14 @@ set -x # Make command execution verbose export PETR4_DEPS="m4 \ libgmp-dev" -export PETR4_DEPS_OPAM="ANSITerminal \ - alcotest \ - bignum \ - cstruct-sexp \ - pp \ - ppx_deriving \ - ppx_deriving_yojson \ - yojson \ - js_of_ocaml \ - js_of_ocaml-lwt \ - js_of_ocaml-ppx" - # install deps sudo apt-get update sudo apt-get install -y --no-install-recommends \ ${PETR4_DEPS} opam update opam upgrade -opam uninstall menhir -opam install menhir.20211128 -# opam install menhir.20211230 -# install p4pp -# opam switch create 4.09.1 -opam pin add p4pp 0.1.7 -# opam pin add p4pp https://github.com/cornell-netlab/p4pp.git eval $(opam env) -#export PATH="/usr/local/opt/dune/bin:$PATH" -#dune external-lib-deps --missing @install -opam install \ - ${PETR4_DEPS_OPAM} +opam install . --deps-only # build petr4 dune build --profile release diff --git a/.github/scripts/typecheck-petr4-vs-p4c.sh b/.github/scripts/typecheck-petr4-vs-p4c.sh index cb1e1cfc8..50c9099f2 100755 --- a/.github/scripts/typecheck-petr4-vs-p4c.sh +++ b/.github/scripts/typecheck-petr4-vs-p4c.sh @@ -87,4 +87,4 @@ set -x # Make command execution verbose # once the result has been inspected we can run petr4 and p4c again # and compare the new files in matched and not-matched with the -# ones in expectation. \ No newline at end of file +# ones in expectation. From 0ea75d7e5a5a5f00601694b46330258ce79e9e88 Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Thu, 14 Jul 2022 16:56:19 -0400 Subject: [PATCH 3/7] fix some versions --- petr4.opam | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/petr4.opam b/petr4.opam index 1c629cbf4..8cd3d76c8 100644 --- a/petr4.opam +++ b/petr4.opam @@ -18,23 +18,23 @@ build: [ depends: [ "alcotest" "bignum" - "ocaml" {>= "4.09.1"} + "ocaml" {>= "4.12.0"} "dune" {>= "1.2"} "cstruct" "cstruct-sexp" "menhir" {<= "20211128"} "ANSITerminal" - "core" {>= "0.13.0"} + "core" {>= "0.14.0"} "ppx_deriving_yojson" - "ppx_jane" {>= "0.13.0" } - "ppx_js_style" {>= "0.13.0" } + "ppx_jane" {>= "0.14.0" } + "ppx_js_style" {>= "0.14444.0" } "yojson" {>= "1.7.0"} "js_of_ocaml" "js_of_ocaml-lwt" "js_of_ocaml-ppx" - "p4pp" {<= "0.1.7"} + "p4pp" {>= "0.1.10"} "odoc" - "ppx_expect" {>= "0.15.0"} + "ppx_expect" {>= "0.14.0"} "pp" {>= "1.0.1"} - "zarith" {= "1.11"} + "zarith" {= "1.12"} ] From aeb69f5c407b276800a9d6468df27d0985672390 Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Thu, 14 Jul 2022 17:13:27 -0400 Subject: [PATCH 4/7] require p4pp v0.1.12 --- petr4.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/petr4.opam b/petr4.opam index 8cd3d76c8..846b3014b 100644 --- a/petr4.opam +++ b/petr4.opam @@ -32,7 +32,7 @@ depends: [ "js_of_ocaml" "js_of_ocaml-lwt" "js_of_ocaml-ppx" - "p4pp" {>= "0.1.10"} + "p4pp" {>= "0.1.12"} "odoc" "ppx_expect" {>= "0.14.0"} "pp" {>= "1.0.1"} From 4a0bcbca2eee16e63e96e8a4ba141779ce1b0fa2 Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Thu, 14 Jul 2022 17:38:17 -0400 Subject: [PATCH 5/7] upgrade to core v0.15 --- bin/common.ml | 2 +- bin/dune | 8 ++++---- bin/main.ml | 6 +++--- lib/bitstring.ml | 2 +- lib/checker.ml | 2 +- lib/context.ml | 2 +- lib/dune | 2 +- lib/ebpf.ml | 2 +- lib/elaborate.ml | 2 +- lib/eval.ml | 4 ++-- lib/hash.ml | 4 ++-- lib/info.ml | 2 +- lib/ops.ml | 2 +- lib/p4core.ml | 2 +- lib/parser.mly | 2 +- lib/pretty.ml | 2 +- lib/prog.ml | 4 ++-- lib/target.ml | 2 +- lib/up4.ml | 2 +- lib/util.ml | 2 +- lib/util.mli | 2 +- lib/v1model.ml | 2 +- p4stf/dune | 4 ++-- p4stf/test.ml | 8 ++++---- petr4.opam | 6 +++--- test/test.ml | 2 +- web/web.ml | 2 +- 27 files changed, 41 insertions(+), 41 deletions(-) diff --git a/bin/common.ml b/bin/common.ml index b65d4abfe..7f38124b0 100644 --- a/bin/common.ml +++ b/bin/common.ml @@ -15,7 +15,7 @@ open Petr4 module P4Info = Info -open Core_kernel +open Core module Info = P4Info module Env = Prog.Env diff --git a/bin/dune b/bin/dune index 0ec44715b..1cf605ed4 100644 --- a/bin/dune +++ b/bin/dune @@ -2,11 +2,11 @@ (public_name petr4) (name main) (modules common main) - (libraries ANSITerminal core p4pp petr4 p4stf alcotest) - (preprocess (pps ppx_jane -allow-unannotated-ignores))) + (libraries ANSITerminal core core_unix core_unix.command_unix p4pp petr4 p4stf alcotest) + (preprocess (pps ppx_jane))) (executable (name test) (modules test) - (libraries ANSITerminal core p4pp petr4 p4stf alcotest) - (preprocess (pps ppx_jane -allow-unannotated-ignores))) + (libraries ANSITerminal core core_unix core_unix.command_unix p4pp petr4 p4stf alcotest) + (preprocess (pps ppx_jane))) diff --git a/bin/main.ml b/bin/main.ml index 9f018cf12..d07401b22 100644 --- a/bin/main.ml +++ b/bin/main.ml @@ -26,9 +26,9 @@ module Conf: Parse_config = struct (["cc"] @ (List.map include_dirs ~f:(Printf.sprintf "-I%s") @ ["-undef"; "-nostdinc"; "-E"; "-x"; "c"; p4file])) in - let in_chan = Unix.open_process_in cmd in + let in_chan = Core_unix.open_process_in cmd in let str = In_channel.input_all in_chan in - let _ = Unix.close_process_in in_chan in + let _ = Core_unix.close_process_in in_chan in str (* let env = P4pp.Eval.empty "" include_dirs [] in @@ -102,4 +102,4 @@ let command = "run", eval_command; "stf", stf_command ] -let () = Command.run ~version: "0.1.2" command +let () = Command_unix.run ~version: "0.1.2" command diff --git a/lib/bitstring.ml b/lib/bitstring.ml index b027e203e..d8265557e 100644 --- a/lib/bitstring.ml +++ b/lib/bitstring.ml @@ -1,4 +1,4 @@ -open Core_kernel +open Core open Prog.Value type t = Bigint.t diff --git a/lib/checker.ml b/lib/checker.ml index 2a0257782..74bc181df 100644 --- a/lib/checker.ml +++ b/lib/checker.ml @@ -5,7 +5,7 @@ open Prog.Env (* hack *) module Petr4Error = Error module Petr4Info = Info -open Core_kernel +open Core open Petr4Error module Error = Petr4Error module Info = Petr4Info diff --git a/lib/context.ml b/lib/context.ml index 0a7db0fb9..632b91a12 100644 --- a/lib/context.ml +++ b/lib/context.ml @@ -13,7 +13,7 @@ * under the License. *) -open Core_kernel +open Core open Util type t = (bool StringMap.t) list [@@deriving sexp] diff --git a/lib/dune b/lib/dune index 9596fec59..0d628f1bc 100644 --- a/lib/dune +++ b/lib/dune @@ -8,4 +8,4 @@ (public_name petr4) (name petr4) (libraries core_kernel bignum ppx_deriving_yojson.runtime yojson cstruct-sexp pp) - (preprocess (pps ppx_jane -allow-unannotated-ignores ppx_deriving_yojson ppx_deriving.show))) + (preprocess (pps ppx_jane ppx_deriving_yojson ppx_deriving.show))) diff --git a/lib/ebpf.ml b/lib/ebpf.ml index 004a08d77..9844b2efa 100644 --- a/lib/ebpf.ml +++ b/lib/ebpf.ml @@ -3,7 +3,7 @@ open Target open Prog open Env open Value -open Core_kernel +open Core open Typed module Info = I let (=) = Stdlib.(=) diff --git a/lib/elaborate.ml b/lib/elaborate.ml index 8f88266b6..1a1359c5f 100644 --- a/lib/elaborate.ml +++ b/lib/elaborate.ml @@ -1,7 +1,7 @@ (* adds type variable at various places. check with Ryan. *) module I = Info -open Core_kernel +open Core open Prog.Env open Util open Types diff --git a/lib/eval.ml b/lib/eval.ml index e70a37e8e..66adbe34c 100644 --- a/lib/eval.ml +++ b/lib/eval.ml @@ -1,5 +1,5 @@ module I = Info -open Core_kernel +open Core open Prog open Env open Typed @@ -779,7 +779,7 @@ module MakeInterpreter (T : Target) = struct else eval_expr env st SContinue r in match op with | And _ -> shortcircuit env st l r not - | Or _ -> shortcircuit env st l r ident + | Or _ -> shortcircuit env st l r Fn.id | _ -> let (st',s,l) = eval_expr env st SContinue l in let (st'',s',r) = eval_expr env st' SContinue r in diff --git a/lib/hash.ml b/lib/hash.ml index 053a81f7f..f4a415f3b 100644 --- a/lib/hash.ml +++ b/lib/hash.ml @@ -1,4 +1,4 @@ -open Core_kernel +open Core open Bitstring let crc16_table = [| @@ -105,4 +105,4 @@ let hash (algo : string) : (Bigint.t * Bigint.t) -> Bigint.t = | "identity" -> hash_identity | "csum16" -> hash_csum16 | "xor16" -> hash_xor16 - | _ -> failwith "unknown hash algorithm" \ No newline at end of file + | _ -> failwith "unknown hash algorithm" diff --git a/lib/info.ml b/lib/info.ml index cf94ca25d..c1a54e4f6 100644 --- a/lib/info.ml +++ b/lib/info.ml @@ -13,7 +13,7 @@ * under the License. *) -open Core_kernel +open Core open Sexplib.Conv type t = diff --git a/lib/ops.ml b/lib/ops.ml index 0293953e9..8295ad025 100644 --- a/lib/ops.ml +++ b/lib/ops.ml @@ -1,5 +1,5 @@ module I = Info -open Core_kernel +open Core module V = Prog.Value module Op = Typed.Op open Bitstring diff --git a/lib/p4core.ml b/lib/p4core.ml index 03e21bafa..f50dc98b5 100644 --- a/lib/p4core.ml +++ b/lib/p4core.ml @@ -4,7 +4,7 @@ open Target open Bitstring open Prog.Env module I = Info -open Core_kernel +open Core module Info = I let (=) = Stdlib.(=) let (<>) = Stdlib.(<>) diff --git a/lib/parser.mly b/lib/parser.mly index 1bccf3b5a..aa37c124d 100644 --- a/lib/parser.mly +++ b/lib/parser.mly @@ -16,7 +16,7 @@ %{ module P4Info = Info -open Core_kernel +open Core open Context open Types diff --git a/lib/pretty.ml b/lib/pretty.ml index 24adc685e..0d6a616a3 100644 --- a/lib/pretty.ml +++ b/lib/pretty.ml @@ -1,4 +1,4 @@ -open Core_kernel +open Core open StdLabels open List open Util diff --git a/lib/prog.ml b/lib/prog.ml index 4c9e521e9..31149b219 100644 --- a/lib/prog.ml +++ b/lib/prog.ml @@ -1,6 +1,6 @@ module I = Info open Util -open Core_kernel +open Core module Info = I open Typed @@ -1876,7 +1876,7 @@ end = struct (* TODO: for the purpose of testing expressions and simple statements only*) let print_env (e:t) : unit = - let open Core_kernel in + let open Core in print_endline "First environment value mappings:"; let f (name, value) = print_string " "; diff --git a/lib/target.ml b/lib/target.ml index ea299fec1..3ef11da1b 100644 --- a/lib/target.ml +++ b/lib/target.ml @@ -4,7 +4,7 @@ open Prog open Value open Env open Bitstring -open Core_kernel +open Core open Util module Info = I let (=) = Stdlib.(=) diff --git a/lib/up4.ml b/lib/up4.ml index 1c1cff66a..0f77ce3bb 100644 --- a/lib/up4.ml +++ b/lib/up4.ml @@ -3,7 +3,7 @@ open Target open Prog open Env open Value -open Core_kernel +open Core open Typed module Info = I let (=) = Stdlib.(=) diff --git a/lib/util.ml b/lib/util.ml index e1507f03c..6a878fb9d 100644 --- a/lib/util.ml +++ b/lib/util.ml @@ -12,7 +12,7 @@ * License for the specific language governing permissions and limitations * under the License. *) -open Core_kernel +open Core module StringMap = Map.Make(String) diff --git a/lib/util.mli b/lib/util.mli index 2d57f174b..ef64aaa58 100644 --- a/lib/util.mli +++ b/lib/util.mli @@ -13,7 +13,7 @@ * under the License. *) -module StringMap : Core_kernel.Map.S with type Key.t = string +module StringMap : Core.Map.S with type Key.t = string type ('a,'b) alternative = Left of 'a diff --git a/lib/v1model.ml b/lib/v1model.ml index 056b465b8..d0787e2a4 100644 --- a/lib/v1model.ml +++ b/lib/v1model.ml @@ -6,7 +6,7 @@ open Target open Error module I = Info module H = Hash -open Core_kernel +open Core module Info = I module Hash = H diff --git a/p4stf/dune b/p4stf/dune index c0f5ea441..a900bf124 100644 --- a/p4stf/dune +++ b/p4stf/dune @@ -6,5 +6,5 @@ (library (name p4stf) - (libraries core ANSITerminal alcotest petr4) - (preprocess (pps ppx_jane -allow-unannotated-ignores ppx_deriving_yojson ppx_deriving.show))) + (libraries core core_unix core_unix.sys_unix ANSITerminal alcotest petr4) + (preprocess (pps ppx_jane ppx_deriving_yojson ppx_deriving.show))) diff --git a/p4stf/test.ml b/p4stf/test.ml index d2cc4f7a7..036241c40 100644 --- a/p4stf/test.ml +++ b/p4stf/test.ml @@ -25,9 +25,9 @@ struct (["cc"] @ (List.map include_dirs ~f:(Printf.sprintf "-I%s") @ ["-undef"; "-nostdinc"; "-E"; "-x"; "c"; p4file])) in - let in_chan = Unix.open_process_in cmd in + let in_chan = Core_unix.open_process_in cmd in let str = In_channel.input_all in_chan in - let _ = Unix.close_process_in in_chan in + let _ = Core_unix.close_process_in in_chan in str end @@ -113,7 +113,7 @@ module MakeRunner (C : RunnerConfig) = struct let action_name' = convert_qualified action_name in let add' = update add tbl_name' (priority, match_list, (action_name', args), id) in run_test prog tl (add',set_def) results expected env st - | Wait -> Unix.sleep 1; run_test prog tl (add,set_def) results expected env st + | Wait -> Core_unix.sleep 1; run_test prog tl (add,set_def) results expected env st | Set_default (tbl_name, (action_name, args)) -> let tbl_name' = convert_qualified tbl_name in let action_name' = convert_qualified action_name in @@ -141,7 +141,7 @@ module Up4RunnerConfig = MakeConfig(Eval.Up4Interpreter) module Up4Runner = MakeRunner(Up4RunnerConfig) let get_stf_files path = - Sys.ls_dir path |> Base.List.to_list |> + Sys_unix.ls_dir path |> Base.List.to_list |> List.filter ~f:(fun x -> Core.Filename.check_suffix x ".stf") let run_stf stf_file p4prog = diff --git a/petr4.opam b/petr4.opam index 846b3014b..131c31727 100644 --- a/petr4.opam +++ b/petr4.opam @@ -24,9 +24,9 @@ depends: [ "cstruct-sexp" "menhir" {<= "20211128"} "ANSITerminal" - "core" {>= "0.14.0"} + "core" {>= "0.15.0"} "ppx_deriving_yojson" - "ppx_jane" {>= "0.14.0" } + "ppx_jane" {>= "0.15.0" } "ppx_js_style" {>= "0.14444.0" } "yojson" {>= "1.7.0"} "js_of_ocaml" @@ -34,7 +34,7 @@ depends: [ "js_of_ocaml-ppx" "p4pp" {>= "0.1.12"} "odoc" - "ppx_expect" {>= "0.14.0"} + "ppx_expect" {>= "0.15.0"} "pp" {>= "1.0.1"} "zarith" {= "1.12"} ] diff --git a/test/test.ml b/test/test.ml index 9d877fa64..76e84fced 100644 --- a/test/test.ml +++ b/test/test.ml @@ -96,7 +96,7 @@ let typecheck_test (include_dirs : string list) (p4_file : string) : bool = let get_files path = Sys.ls_dir path |> List.filter ~f:(fun name -> - Core_kernel.Filename.check_suffix name ".p4") + Core.Filename.check_suffix name ".p4") let example_path l = let root = Filename.concat ".." "examples" in diff --git a/web/web.ml b/web/web.ml index da3aa9940..2c304bf6e 100644 --- a/web/web.ml +++ b/web/web.ml @@ -16,7 +16,7 @@ open Petr4.Common open Js_of_ocaml -open Core_kernel +open Core exception ParsingError of string From 750d6600ddb91c804592a5f98b44f99994102861 Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Mon, 18 Jul 2022 12:02:19 -0400 Subject: [PATCH 6/7] fix sys/unix invocations in test/ --- test/dune | 2 +- test/test.ml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/dune b/test/dune index 1db246d3c..588efb951 100644 --- a/test/dune +++ b/test/dune @@ -1,5 +1,5 @@ (tests (names test) - (libraries core p4pp petr4 alcotest) + (libraries core core_unix core_unix.sys_unix p4pp petr4 alcotest) (deps (source_tree ../examples)) (action (run %{test} -e))) diff --git a/test/test.ml b/test/test.ml index 76e84fced..9b9a1fb7a 100644 --- a/test/test.ml +++ b/test/test.ml @@ -14,9 +14,9 @@ let print pp = Format.printf "%a@." Pp.to_fmt pp (["cc"] @ (List.map include_dirs ~f:(Printf.sprintf "-I%s") @ ["-undef"; "-nostdinc"; "-E"; "-x"; "c"; p4file])) in - let in_chan = Unix.open_process_in cmd in + let in_chan = Core_unix.open_process_in cmd in let str = In_channel.input_all in_chan in - let _ = Unix.close_process_in in_chan in + let _ = Core_unix.close_process_in in_chan in str (* end *) @@ -94,7 +94,7 @@ let typecheck_test (include_dirs : string list) (p4_file : string) : bool = | `Error (info, err) -> false let get_files path = - Sys.ls_dir path + Sys_unix.ls_dir path |> List.filter ~f:(fun name -> Core.Filename.check_suffix name ".p4") From 726d52ba69d1540f3838290ab0fc46ebaaffb4ce Mon Sep 17 00:00:00 2001 From: Ryan Doenges Date: Mon, 18 Jul 2022 12:08:01 -0400 Subject: [PATCH 7/7] delete broken symbolic links to UBPF tests --- ci-test/testdata/p4_16_samples/ipv4-actions_ubpf.p4 | 1 - ci-test/testdata/p4_16_samples/ipv6-actions_ubpf.p4 | 1 - ci-test/testdata/p4_16_samples/simple-actions_ubpf.p4 | 1 - ci-test/testdata/p4_16_samples/simple-firewall_ubpf.p4 | 1 - ci-test/testdata/p4_16_samples/tunneling_ubpf.p4 | 1 - 5 files changed, 5 deletions(-) delete mode 120000 ci-test/testdata/p4_16_samples/ipv4-actions_ubpf.p4 delete mode 120000 ci-test/testdata/p4_16_samples/ipv6-actions_ubpf.p4 delete mode 120000 ci-test/testdata/p4_16_samples/simple-actions_ubpf.p4 delete mode 120000 ci-test/testdata/p4_16_samples/simple-firewall_ubpf.p4 delete mode 120000 ci-test/testdata/p4_16_samples/tunneling_ubpf.p4 diff --git a/ci-test/testdata/p4_16_samples/ipv4-actions_ubpf.p4 b/ci-test/testdata/p4_16_samples/ipv4-actions_ubpf.p4 deleted file mode 120000 index 422ef4869..000000000 --- a/ci-test/testdata/p4_16_samples/ipv4-actions_ubpf.p4 +++ /dev/null @@ -1 +0,0 @@ -../../backends/ubpf/tests/testdata/test-ipv4-actions.p4 \ No newline at end of file diff --git a/ci-test/testdata/p4_16_samples/ipv6-actions_ubpf.p4 b/ci-test/testdata/p4_16_samples/ipv6-actions_ubpf.p4 deleted file mode 120000 index 5925515ef..000000000 --- a/ci-test/testdata/p4_16_samples/ipv6-actions_ubpf.p4 +++ /dev/null @@ -1 +0,0 @@ -../../backends/ubpf/tests/testdata/test-ipv6-actions.p4 \ No newline at end of file diff --git a/ci-test/testdata/p4_16_samples/simple-actions_ubpf.p4 b/ci-test/testdata/p4_16_samples/simple-actions_ubpf.p4 deleted file mode 120000 index 70928e4d1..000000000 --- a/ci-test/testdata/p4_16_samples/simple-actions_ubpf.p4 +++ /dev/null @@ -1 +0,0 @@ -../../backends/ubpf/tests/testdata/test-simple-actions.p4 \ No newline at end of file diff --git a/ci-test/testdata/p4_16_samples/simple-firewall_ubpf.p4 b/ci-test/testdata/p4_16_samples/simple-firewall_ubpf.p4 deleted file mode 120000 index 1c839b310..000000000 --- a/ci-test/testdata/p4_16_samples/simple-firewall_ubpf.p4 +++ /dev/null @@ -1 +0,0 @@ -../../backends/ubpf/tests/testdata/test-simple-firewall.p4 \ No newline at end of file diff --git a/ci-test/testdata/p4_16_samples/tunneling_ubpf.p4 b/ci-test/testdata/p4_16_samples/tunneling_ubpf.p4 deleted file mode 120000 index 0b4ead0a1..000000000 --- a/ci-test/testdata/p4_16_samples/tunneling_ubpf.p4 +++ /dev/null @@ -1 +0,0 @@ -../../backends/ubpf/tests/testdata/test-tunneling.p4 \ No newline at end of file