author | Rich Burridge <rich.burridge@oracle.com> |
Wed, 07 Jan 2015 16:57:24 -0800 | |
changeset 3597 | c79130430988 |
child 4747 | 0e43ac303e45 |
permissions | -rw-r--r-- |
3597
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
** Set PATH = .:$(@D):/bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
** This produces no conflict (unless /bin contains conflict!): |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
Current working directory is "$(@D)" |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
-> . |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--> /bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
*+: conflict |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
** Set PATH = .:$(@D):/bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
** This shows conflict between different filetypes |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
Current working directory is "$(@D)" |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
:----> . |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
:----:----> /bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
:co.-:--.-: conflict (.c,.o,) |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
** Set PATH = .:$(@D):/bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
** This repeats the last test, with pathnames-only |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
./conflict.c |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
./conflict.o |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
./conflict |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
/bin/conflict |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
** Add a dummy executable in the current directory |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
** /tmp/conflict.xxxxxx |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
** producing a conflict with the executable |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
** $(@D)/conflict |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
** |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
** For Unix, the conflict will be in the empty suffix (first column |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
** of the report). For Win32 it will be in the combination of empty |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
** and "e" (.exe) suffixes. |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
Current working directory is "/tmp/conflict.xxxxxx" |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
:---> . |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
:---:---> $(@D) |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
35 |
:---:---:---> /bin |
c79130430988
20318428 conflict should have some master test results to compare against
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
36 |
:.--:.--:.--: conflict () |