From f65377448e74fc7e575e4df258fb0a48a09e39cc Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 22 Jun 2017 20:06:01 +0300 Subject: Add support for $path_search() and $path_match() --- unit-tests/cc/lexer/buildfile | 10 +++++----- unit-tests/cc/parser/buildfile | 9 +++++---- unit-tests/function/buildfile | 6 +++--- unit-tests/lexer/buildfile | 6 +++--- unit-tests/scheduler/buildfile | 6 +++--- unit-tests/test/script/lexer/buildfile | 6 +++--- unit-tests/test/script/parser/buildfile | 10 +++++----- 7 files changed, 27 insertions(+), 26 deletions(-) (limited to 'unit-tests') diff --git a/unit-tests/cc/lexer/buildfile b/unit-tests/cc/lexer/buildfile index ff4e0b3..3152e77 100644 --- a/unit-tests/cc/lexer/buildfile +++ b/unit-tests/cc/lexer/buildfile @@ -5,11 +5,11 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = cc/lexer token lexer diagnostics utility variable name b-options types-parsers \ -context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ -config/{utility init operation module} spec +src = cc/lexer token lexer diagnostics utility variable name b-options \ +types-parsers context scope parser target operation rule prerequisite file \ +module function functions-builtin functions-filesystem functions-path \ +functions-process-path functions-string functions-target-triplet algorithm \ +search dump filesystem scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../../build2/cxx{$src} ../../../build2/liba{b} \ $libs test{*} diff --git a/unit-tests/cc/parser/buildfile b/unit-tests/cc/parser/buildfile index 5d20367..bb1ad53 100644 --- a/unit-tests/cc/parser/buildfile +++ b/unit-tests/cc/parser/buildfile @@ -5,10 +5,11 @@ #@@ Temporary until we get utility library support. # import libs = libbutl%lib{butl} -src = cc/{lexer parser} token lexer diagnostics utility variable name b-options types-parsers \ -context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ +src = cc/{lexer parser} token lexer diagnostics utility variable name \ +b-options types-parsers context scope parser target operation rule \ +prerequisite file module function functions-builtin functions-filesystem \ +functions-path functions-process-path functions-string \ +functions-target-triplet algorithm search dump filesystem scheduler \ config/{utility init operation module} spec exe{driver}: cxx{driver} ../../../build2/cxx{$src} ../../../build2/liba{b} \ diff --git a/unit-tests/function/buildfile b/unit-tests/function/buildfile index e61737c..c0cd26f 100644 --- a/unit-tests/function/buildfile +++ b/unit-tests/function/buildfile @@ -7,9 +7,9 @@ import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ -config/{utility init operation module} spec +functions-builtin functions-filesystem functions-path functions-process-path \ +functions-string functions-target-triplet algorithm search dump filesystem \ +scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs test{call syntax} diff --git a/unit-tests/lexer/buildfile b/unit-tests/lexer/buildfile index d3bbbfe..3d4e3ed 100644 --- a/unit-tests/lexer/buildfile +++ b/unit-tests/lexer/buildfile @@ -7,9 +7,9 @@ import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ -config/{utility init operation module} spec +functions-builtin functions-filesystem functions-path functions-process-path \ +functions-string functions-target-triplet algorithm search dump filesystem \ +scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs \ test{*} diff --git a/unit-tests/scheduler/buildfile b/unit-tests/scheduler/buildfile index 0a12414..22361b5 100644 --- a/unit-tests/scheduler/buildfile +++ b/unit-tests/scheduler/buildfile @@ -7,9 +7,9 @@ import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ -config/{utility init operation module} spec +functions-builtin functions-filesystem functions-path functions-process-path \ +functions-string functions-target-triplet algorithm search dump filesystem \ +scheduler config/{utility init operation module} spec exe{driver}: cxx{driver} ../../build2/cxx{$src} ../../build2/liba{b} $libs diff --git a/unit-tests/test/script/lexer/buildfile b/unit-tests/test/script/lexer/buildfile index c5f3d2a..2070089 100644 --- a/unit-tests/test/script/lexer/buildfile +++ b/unit-tests/test/script/lexer/buildfile @@ -7,9 +7,9 @@ import libs = libbutl%lib{butl} src = token lexer diagnostics utility variable name b-options types-parsers \ context scope parser target operation rule prerequisite file module function \ -functions-builtin functions-path functions-process-path functions-string \ -functions-target-triplet algorithm search dump filesystem scheduler \ -config/{utility init operation module} test/script/{token lexer} spec +functions-builtin functions-filesystem functions-path functions-process-path \ +functions-string functions-target-triplet algorithm search dump filesystem \ +scheduler config/{utility init operation module} test/script/{token lexer} spec exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs \ test{command-line first-token second-token command-expansion variable-line \ diff --git a/unit-tests/test/script/parser/buildfile b/unit-tests/test/script/parser/buildfile index 5ca2d0b..634120c 100644 --- a/unit-tests/test/script/parser/buildfile +++ b/unit-tests/test/script/parser/buildfile @@ -6,11 +6,11 @@ # import libs = libbutl%lib{butl} src = token lexer parser diagnostics utility variable name context target \ -scope prerequisite file module operation rule b-options algorithm search \ -filesystem function functions-builtin functions-path functions-process-path \ -functions-string functions-target-triplet config/{utility init operation module} \ -dump types-parsers test/{target script/{token lexer parser regex script}} \ -scheduler spec +scope prerequisite file module operation rule b-options algorithm search \ +filesystem function functions-builtin functions-filesystem functions-path \ +functions-process-path functions-string functions-target-triplet \ +config/{utility init operation module} dump types-parsers \ +test/{target script/{token lexer parser regex script}} scheduler spec exe{driver}: cxx{driver} ../../../../build2/cxx{$src} ../../../../build2/liba{b} $libs \ test{cleanup command-if command-re-parse description directive exit \ -- cgit v1.1