[go] fix find_command.mk - "cd xxx && find ."

3 files changed, 19 insertions, 6 deletions

diff --git a/pathutil.go b/pathutil.go
index 68d06c4..0d3aa05 100644
--- a/pathutil.go
+++ b/pathutil.go
@@ -470,16 +470,24 @@ func parseFindCommand(cmd string) (findCommand, error) {
 		}
 	}
 	glog.V(3).Infof("find command: %#v", fcp.fc)
+
+	// TODO(ukai): handle this in run() instead of fallback shell.
+	_, ents := fsCache.readdir(filepathClean(fcp.fc.testdir), unknownFileid)
+	if ents == nil {
+		glog.V(1).Infof("find: testdir %s - not dir", fcp.fc.testdir)
+		return fcp.fc, errFindNoSuchDir
+	}
+	_, ents = fsCache.readdir(filepathClean(fcp.fc.chdir), unknownFileid)
+	if ents == nil {
+		glog.V(1).Infof("find: cd %s: No such file or directory", fcp.fc.chdir)
+		return fcp.fc, errFindNoSuchDir
+	}
+
 	return fcp.fc, nil
 }
 
 func (fc findCommand) run(w evalWriter) {
 	glog.V(3).Infof("find: %#v", fc)
-	_, ents := fsCache.readdir(filepathClean(fc.testdir), unknownFileid)
-	if ents == nil {
-		glog.V(1).Infof("find: testdir %s - not dir", fc.testdir)
-		return
-	}
 	for _, dir := range fc.finddirs {
 		seen := make(map[fileid]string)
 		id, _ := fsCache.readdir(filepathClean(filepathJoin(fc.chdir, dir)), unknownFileid)
@@ -520,7 +528,7 @@ var (
 	errFindExtra           = errors.New("find command: extra")
 	errFindUnexpectedEnd   = errors.New("find command: unexpected end")
 	errFindAbspath         = errors.New("find command: abs path")
-	errFindChdirAndTestdir = errors.New("find command: chdir, testdir")
+	errFindNoSuchDir       = errors.New("find command: no such dir")
 )
 
 type findCommandParser struct {
diff --git a/pathutil_test.go b/pathutil_test.go
index d64bb65..33b7e32 100644
--- a/pathutil_test.go
+++ b/pathutil_test.go
@@ -142,6 +142,10 @@ func TestFilepathClean(t *testing.T) {
 }
 
 func TestParseFindCommand(t *testing.T) {
+	fs := newFS()
+	defer fs.close()
+	fs.add(fs.dir, "testdir")
+
 	maxdepth := 1<<31 - 1
 	for _, tc := range []struct {
 		cmd  string
diff --git a/runtest.rb b/runtest.rb
index 4d391fc..60a7e84 100755
--- a/runtest.rb
+++ b/runtest.rb
@@ -137,6 +137,7 @@ def normalize_kati_log(output)
                "\\1: Command not found")
   output.gsub!(/.*: warning for parse error in an unevaluated line: .*\n/, '')
   output.gsub!(/^FindEmulator: /, '')
+  output.gsub!(/^\/bin\/sh: line 0: /, '')
   output.gsub!(/ (\.\/+)+kati\.\S+/, '') # kati log files in find_command.mk
   output.gsub!(/ (\.\/+)+test\S+.json/, '') # json files in find_command.mk
   output