Update the existing canWrite tests to take advantage of the ".." fix.

Author: mattmccutchen-cci

clang/test/3C/base_subdir/canwrite_constraints_function_and_variable.c

@@ -4,28 +4,25 @@
 // variable declarations and checked regions.
 // (https://github.com/correctcomputation/checkedc-clang/issues/387)
 
-// TODO: When https://github.com/correctcomputation/checkedc-clang/issues/327 is
-// fixed, replace the absolute -I option with a .. in the #include directive.
-//
 // TODO: Windows compatibility?
 
 // "Lower" case: -base-dir should default to the working directory, so we should
 // not allow canwrite_constraints_function_and_variable.h to change, and the
 // internal types of q and the return should remain wild.
 //
-// RUN: cd %S && 3c -addcr -extra-arg=-I${PWD%/*} -output-dir=%t.checked/base_subdir -warn-all-root-cause -verify %s
+// RUN: cd %S && 3c -addcr -output-dir=%t.checked/base_subdir -warn-all-root-cause -verify %s
 // RUN: FileCheck -match-full-lines -check-prefixes=CHECK_LOWER --input-file %t.checked/base_subdir/canwrite_constraints_function_and_variable.c %s
 // RUN: test ! -f %t.checked/canwrite_constraints_function_and_variable.checked.h
 
 // "Higher" case: When -base-dir is set to the parent directory, we can change
 // canwrite_constraints_function_and_variable.h, so both q and the return should
 // become checked.
 //
-// RUN: cd %S && 3c -addcr -extra-arg=-I${PWD%/*} -base-dir=${PWD%/*} -output-dir=%t.checked2 %s
+// RUN: cd %S && 3c -addcr -base-dir=.. -output-dir=%t.checked2 %s
 // RUN: FileCheck -match-full-lines -check-prefixes=CHECK_HIGHER --input-file %t.checked2/base_subdir/canwrite_constraints_function_and_variable.c %s
 // RUN: FileCheck -match-full-lines -check-prefixes=CHECK_HIGHER --input-file %t.checked2/canwrite_constraints_function_and_variable.h %S/../canwrite_constraints_function_and_variable.h
 
-#include "canwrite_constraints_function_and_variable.h"
+#include "../canwrite_constraints_function_and_variable.h"
 
 int *bar(int *q) {
   // CHECK_LOWER: int *bar(int *q : itype(_Ptr<int>)) : itype(_Ptr<int>) {

clang/test/3C/base_subdir/canwrite_constraints_typedef.c

@@ -5,12 +5,12 @@
 
 // TODO: Ditto the TODO comments from
 // canwrite_constraints_function_and_variable.c re the RUN commands.
-// RUN: cd %S && 3c -addcr -extra-arg=-I${PWD%/*} -verify %s | FileCheck -match-full-lines %s
+// RUN: cd %S && 3c -addcr -verify %s | FileCheck -match-full-lines %s
 
-// expected-error@unwritable_typedef.h:1 {{3C internal error: 3C generated changes to this file even though it is not allowed to write to the file}}
-// expected-note@unwritable_typedef.h:1 {{-dump-unwritable-changes}}
+// expected-error@../unwritable_typedef.h:1 {{3C internal error: 3C generated changes to this file even though it is not allowed to write to the file}}
+// expected-note@../unwritable_typedef.h:1 {{-dump-unwritable-changes}}
 
-#include "unwritable_typedef.h"
+#include "../unwritable_typedef.h"
 
 foo_typedef p = ((void *)0);